Tweak. [rsc] --rw-rw-r-- M 615310 presotto sys 4509 Dec 2 11:49 sys/man/8/smtp /n/sourcesdump/2005/1202/plan9/sys/man/8/smtp:52,71 - /n/sourcesdump/2005/1203/plan9/sys/man/8/smtp:52,67 .B -d turn on debugging to standard error. .TP - .B -a - authenticate ourself to the server if the server - supports PLAIN authentication and allows us to first - start up an encrypted TLS connection - .TP .B -s if the server supports the ESMTP extension to use TLS encryption, turn it on for this session. See RFC3207 for details. .TP - .B -a - if the server supports the ESMTP extension to use TLS encryption, turn it - on. If the server also supports the PLAIN (user + password) authentication, + if the server also supports PLAIN or LOGIN authentication, authenticate to the server using a password from - .IR factotum (4). See RFC's 3207 and 2554. + .IR factotum (4). + See RFCs 3207 and 2554. + This option also implies + .B -s . .TP .B -u specify a user name to be used in authentication. The default name is /n/sourcesdump/2005/1202/plan9/sys/man/8/smtp:92,98 - /n/sourcesdump/2005/1203/plan9/sys/man/8/smtp:88,94 .PP Finally if .I .domain - is given, it is appended to the end of any unqaulified system names + is given, it is appended to the end of any unqualified system names in the envelope or header. .PP .I Smtpd /n/sourcesdump/2005/1202/plan9/sys/man/8/smtp:118,126 - /n/sourcesdump/2005/1203/plan9/sys/man/8/smtp:114,124 .BR /mail/lib/whitelist , an append only file. Addresses can be added to the whitelist by the administrator. However, - the usual way for addresses to be added is by smtpd itself. Whenever, - a message is received and the sender's address isn't on the whitelist, - .B smtpd + the usual way for addresses to be added is by + .I smtpd + itself. + Whenever a message is received and the sender's address isn't on the whitelist, + .I smtpd first looks for the file, .B /mail/grey/// . If that file exists, the remote address is added to the whitelist. If Add Unix syslog. [rsc] --rw-rw-r-- M 615310 glenda sys 5376 Dec 2 15:01 lib/ndb/common /n/sourcesdump/2005/1202/plan9/lib/ndb/common:216,221 - /n/sourcesdump/2005/1203/plan9/lib/ndb/common:216,222 udp=ntp port=123 udp=netbios-ns port=137 udp=snmp port=161 + udp=syslog port=514 udp=rip port=520 udp=dhcp6c port=546 udp=dhcp6s port=547 Fall back if cs fails to be useful. [rsc] --rw-rw-r-- M 615310 glenda sys 18036 Dec 2 15:05 sys/src/cmd/auth/factotum/util.c /n/sourcesdump/2005/1202/plan9/sys/src/cmd/auth/factotum/util.c:26,37 - /n/sourcesdump/2005/1203/plan9/sys/src/cmd/auth/factotum/util.c:26,36 _authdial(char *net, char *authdom) { int fd; - int vanilla; - vanilla = net==nil || strcmp(net, "/net")==0; - - if(!vanilla || bindnetcs()>=0) - return authdial(net, authdom); + if(bindnetcs() >= 0 && (fd=authdial(net, authdom)) >= 0) + return fd; + if(net != nil && strcmp(net, "/net") != 0) + return -1; /* use the auth sever passed to us as an arg */ if(authaddr == nil)