Browse Source

Plan 9 from Bell Labs 2005-12-03

David du Colombier 15 years ago
parent
commit
6d72dfacd9
6 changed files with 31 additions and 28 deletions
  1. 5 5
      dist/replica/_plan9.db
  2. 5 5
      dist/replica/plan9.db
  3. 5 0
      dist/replica/plan9.log
  4. 1 0
      lib/ndb/common
  5. 11 13
      sys/man/8/smtp
  6. 4 5
      sys/src/cmd/auth/factotum/util.c

+ 5 - 5
dist/replica/_plan9.db

@@ -37,7 +37,7 @@
 386/bin/ape/stty - 775 sys sys 1130384232 41057
 386/bin/ape/tar - 775 sys sys 1132418759 61979
 386/bin/ape/uname - 775 sys sys 1127360563 132691
-386/bin/aquarela - 775 sys sys 1064598027 319170
+386/bin/aquarela - 775 sys sys 1133529402 319170
 386/bin/ar - 775 sys sys 1131296672 111983
 386/bin/archfs - 775 sys sys 1133186773 141184
 386/bin/ascii - 775 sys sys 1130594693 64691
@@ -53,7 +53,7 @@
 386/bin/auth/debug - 775 sys sys 1130594696 101087
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1133186774 313147
+386/bin/auth/factotum - 775 sys sys 1133561367 313136
 386/bin/auth/fgui - 775 sys sys 1132506830 218304
 386/bin/auth/guard.srv - 775 sys sys 1130594697 142873
 386/bin/auth/iam - 775 sys sys 1085076981 50791
@@ -5180,7 +5180,7 @@ lib/namespace.ftp - 664 sys sys 1020313578 373
 lib/namespace.httpd - 664 sys sys 984695868 1209
 lib/ndb - 20000000775 sys sys 959260770 0
 lib/ndb/auth - 664 sys sys 1117108784 572
-lib/ndb/common - 664 sys sys 1133147947 5356
+lib/ndb/common - 664 sys sys 1133553666 5376
 lib/ndb/consoledb - 664 sys sys 960222421 95
 lib/ndb/dhcp - 20000000775 sys sys 959260749 0
 lib/ndb/dnsdump - 664 sys sys 1032057649 61
@@ -7721,7 +7721,7 @@ sys/man/8/scuzz - 664 sys sys 984709640 7916
 sys/man/8/secstore - 664 sys sys 1105016705 1954
 sys/man/8/securenet - 664 sys sys 954305552 3160
 sys/man/8/send - 664 sys sys 1045501634 2168
-sys/man/8/smtp - 664 sys sys 1091126310 4724
+sys/man/8/smtp - 664 sys sys 1133542190 4509
 sys/man/8/snoopy - 664 sys sys 1128179510 4054
 sys/man/8/stats - 664 sys sys 1067722908 4291
 sys/man/8/statusbar - 664 sys sys 1131317865 1251
@@ -9371,7 +9371,7 @@ sys/src/cmd/auth/factotum/rpc.c - 664 sys sys 1107633794 11167
 sys/src/cmd/auth/factotum/rsa.c - 664 sys sys 1107706104 3416
 sys/src/cmd/auth/factotum/secstore.c - 664 sys sys 1107633794 14935
 sys/src/cmd/auth/factotum/sshrsa.c - 664 sys sys 1107633793 3416
-sys/src/cmd/auth/factotum/util.c - 664 sys sys 1131289797 18035
+sys/src/cmd/auth/factotum/util.c - 664 sys sys 1133553937 18036
 sys/src/cmd/auth/factotum/wep.c - 664 sys sys 1107706104 2140
 sys/src/cmd/auth/guard.srv.c - 664 sys sys 1032497638 2334
 sys/src/cmd/auth/iam.c - 664 sys sys 1015008430 841

+ 5 - 5
dist/replica/plan9.db

@@ -37,7 +37,7 @@
 386/bin/ape/stty - 775 sys sys 1130384232 41057
 386/bin/ape/tar - 775 sys sys 1132418759 61979
 386/bin/ape/uname - 775 sys sys 1127360563 132691
-386/bin/aquarela - 775 sys sys 1064598027 319170
+386/bin/aquarela - 775 sys sys 1133529402 319170
 386/bin/ar - 775 sys sys 1131296672 111983
 386/bin/archfs - 775 sys sys 1133186773 141184
 386/bin/ascii - 775 sys sys 1130594693 64691
@@ -53,7 +53,7 @@
 386/bin/auth/debug - 775 sys sys 1130594696 101087
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1133186774 313147
+386/bin/auth/factotum - 775 sys sys 1133561367 313136
 386/bin/auth/fgui - 775 sys sys 1132506830 218304
 386/bin/auth/guard.srv - 775 sys sys 1130594697 142873
 386/bin/auth/iam - 775 sys sys 1085076981 50791
@@ -5180,7 +5180,7 @@ lib/namespace.ftp - 664 sys sys 1020313578 373
 lib/namespace.httpd - 664 sys sys 984695868 1209
 lib/ndb - 20000000775 sys sys 959260770 0
 lib/ndb/auth - 664 sys sys 1117108784 572
-lib/ndb/common - 664 sys sys 1133147947 5356
+lib/ndb/common - 664 sys sys 1133553666 5376
 lib/ndb/consoledb - 664 sys sys 960222421 95
 lib/ndb/dhcp - 20000000775 sys sys 959260749 0
 lib/ndb/dnsdump - 664 sys sys 1032057649 61
@@ -7721,7 +7721,7 @@ sys/man/8/scuzz - 664 sys sys 984709640 7916
 sys/man/8/secstore - 664 sys sys 1105016705 1954
 sys/man/8/securenet - 664 sys sys 954305552 3160
 sys/man/8/send - 664 sys sys 1045501634 2168
-sys/man/8/smtp - 664 sys sys 1091126310 4724
+sys/man/8/smtp - 664 sys sys 1133542190 4509
 sys/man/8/snoopy - 664 sys sys 1128179510 4054
 sys/man/8/stats - 664 sys sys 1067722908 4291
 sys/man/8/statusbar - 664 sys sys 1131317865 1251
@@ -9371,7 +9371,7 @@ sys/src/cmd/auth/factotum/rpc.c - 664 sys sys 1107633794 11167
 sys/src/cmd/auth/factotum/rsa.c - 664 sys sys 1107706104 3416
 sys/src/cmd/auth/factotum/secstore.c - 664 sys sys 1107633794 14935
 sys/src/cmd/auth/factotum/sshrsa.c - 664 sys sys 1107633793 3416
-sys/src/cmd/auth/factotum/util.c - 664 sys sys 1131289797 18035
+sys/src/cmd/auth/factotum/util.c - 664 sys sys 1133553937 18036
 sys/src/cmd/auth/factotum/wep.c - 664 sys sys 1107706104 2140
 sys/src/cmd/auth/guard.srv.c - 664 sys sys 1032497638 2334
 sys/src/cmd/auth/iam.c - 664 sys sys 1015008430 841

+ 5 - 0
dist/replica/plan9.log

@@ -23336,3 +23336,8 @@
 1133463719 4 c sys/src/cmd/vt/vt.c - 664 sys sys 1133463639 20180
 1133465520 0 c sys/src/9/pc/ether83815.c - 664 sys sys 1133464742 23556
 1133469120 0 c 386/bin/vt - 775 sys sys 1133468806 178593
+1133530218 0 c 386/bin/aquarela - 775 sys sys 1133529402 319170
+1133542820 0 c sys/man/8/smtp - 664 sys sys 1133542190 4509
+1133555422 0 c lib/ndb/common - 664 sys sys 1133553666 5376
+1133555422 1 c sys/src/cmd/auth/factotum/util.c - 664 sys sys 1133553937 18036
+1133562625 0 c 386/bin/auth/factotum - 775 sys sys 1133561367 313136

+ 1 - 0
lib/ndb/common

@@ -216,6 +216,7 @@ udp=portmap port=111
 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

+ 11 - 13
sys/man/8/smtp

@@ -52,20 +52,16 @@ The options are:
 .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
@@ -92,7 +88,7 @@ find an address or MX entry for the destination system.
 .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
@@ -118,9 +114,11 @@ retry code) unless the sender's IP address is on the whitelist,
 .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/<remote ipaddr>/<local ipaddr>/<recipient> .
 If that file exists, the remote address is added to the whitelist.  If

+ 4 - 5
sys/src/cmd/auth/factotum/util.c

@@ -26,12 +26,11 @@ int
 _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)