Browse Source

Plan 9 from Bell Labs 2007-03-25

David du Colombier 17 years ago
parent
commit
066085332f
9 changed files with 90 additions and 35 deletions
  1. 6 6
      dist/replica/_plan9.db
  2. 6 6
      dist/replica/plan9.db
  3. 8 0
      dist/replica/plan9.log
  4. 1 0
      sys/man/3/ip
  5. 4 1
      sys/man/6/ndb
  6. 33 12
      sys/man/8/cpurc
  7. 17 5
      sys/man/8/listen
  8. 12 2
      sys/man/8/ndb
  9. 3 3
      sys/src/cmd/ndb/dblookup.c

+ 6 - 6
dist/replica/_plan9.db

@@ -7589,7 +7589,7 @@ sys/man/3/ether - 664 sys sys 984709635 2563
 sys/man/3/floppy - 664 sys sys 954378905 881
 sys/man/3/fs - 664 sys sys 1174450141 2894
 sys/man/3/i82365 - 664 sys sys 954378906 884
-sys/man/3/ip - 664 sys sys 1169599032 22614
+sys/man/3/ip - 664 sys sys 1174771711 22618
 sys/man/3/kbmap - 664 sys sys 1131110122 1732
 sys/man/3/kprof - 664 sys sys 1018029972 1377
 sys/man/3/loopback - 664 sys sys 964662153 1995
@@ -7690,7 +7690,7 @@ sys/man/6/mnihongo - 664 sys sys 1158064572 716
 sys/man/6/mpictures - 664 sys sys 944959678 2899
 sys/man/6/ms - 664 sys sys 958249504 6815
 sys/man/6/namespace - 664 sys sys 1048637182 1576
-sys/man/6/ndb - 664 sys sys 1174688660 6670
+sys/man/6/ndb - 664 sys sys 1174770884 6755
 sys/man/6/plot - 664 sys sys 944959679 6739
 sys/man/6/plumb - 664 sys sys 969499892 10918
 sys/man/6/regexp - 664 sys sys 954089523 2050
@@ -7724,7 +7724,7 @@ sys/man/8/apm - 664 sys sys 1017679308 1811
 sys/man/8/auth - 664 sys sys 1163208463 4227
 sys/man/8/boot - 664 sys sys 1165623055 8357
 sys/man/8/booting - 664 sys sys 1015024984 4136
-sys/man/8/cpurc - 664 sys sys 971455510 1275
+sys/man/8/cpurc - 664 sys sys 1174792133 1541
 sys/man/8/cron - 664 sys sys 1063858596 1867
 sys/man/8/dhcpd - 664 sys sys 1172959497 5572
 sys/man/8/disksim - 664 sys sys 1144150487 1476
@@ -7740,7 +7740,7 @@ sys/man/8/init - 664 sys sys 944959679 1430
 sys/man/8/ipconfig - 664 sys sys 1159419702 6170
 sys/man/8/ipserv - 664 sys sys 1095862383 4375
 sys/man/8/kfscmd - 664 sys sys 1068569797 4515
-sys/man/8/listen - 664 sys sys 1173736981 3562
+sys/man/8/listen - 664 sys sys 1174792129 3826
 sys/man/8/lp - 664 sys sys 954614702 2491
 sys/man/8/mk9660 - 664 sys sys 1104430379 3946
 sys/man/8/mkfs - 664 sys sys 1163208436 3414
@@ -7748,7 +7748,7 @@ sys/man/8/mkpaqfs - 664 sys sys 1018386778 892
 sys/man/8/mksacfs - 664 sys sys 964886843 710
 sys/man/8/mouse - 664 sys sys 971455511 2476
 sys/man/8/na - 664 sys sys 958527089 859
-sys/man/8/ndb - 664 sys sys 1174626196 12927
+sys/man/8/ndb - 664 sys sys 1174774024 13164
 sys/man/8/newuser - 664 sys sys 1116954242 2418
 sys/man/8/nfsserver - 664 sys sys 1163208425 3587
 sys/man/8/pcmcia - 664 sys sys 944959679 408
@@ -12676,7 +12676,7 @@ sys/src/cmd/ndb/convDNS2M.c - 664 sys sys 1174690184 6801
 sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1174690173 10779
 sys/src/cmd/ndb/cs.c - 664 sys sys 1163208159 33080
 sys/src/cmd/ndb/csquery.c - 664 sys sys 1174626119 1073
-sys/src/cmd/ndb/dblookup.c - 664 sys sys 1174690228 20863
+sys/src/cmd/ndb/dblookup.c - 664 sys sys 1174792290 20940
 sys/src/cmd/ndb/dn.c - 664 sys sys 1174690061 32609
 sys/src/cmd/ndb/dnarea.c - 664 sys sys 1174626121 2505
 sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1174626121 3122

+ 6 - 6
dist/replica/plan9.db

@@ -7589,7 +7589,7 @@ sys/man/3/ether - 664 sys sys 984709635 2563
 sys/man/3/floppy - 664 sys sys 954378905 881
 sys/man/3/fs - 664 sys sys 1174450141 2894
 sys/man/3/i82365 - 664 sys sys 954378906 884
-sys/man/3/ip - 664 sys sys 1169599032 22614
+sys/man/3/ip - 664 sys sys 1174771711 22618
 sys/man/3/kbmap - 664 sys sys 1131110122 1732
 sys/man/3/kprof - 664 sys sys 1018029972 1377
 sys/man/3/loopback - 664 sys sys 964662153 1995
@@ -7690,7 +7690,7 @@ sys/man/6/mnihongo - 664 sys sys 1158064572 716
 sys/man/6/mpictures - 664 sys sys 944959678 2899
 sys/man/6/ms - 664 sys sys 958249504 6815
 sys/man/6/namespace - 664 sys sys 1048637182 1576
-sys/man/6/ndb - 664 sys sys 1174688660 6670
+sys/man/6/ndb - 664 sys sys 1174770884 6755
 sys/man/6/plot - 664 sys sys 944959679 6739
 sys/man/6/plumb - 664 sys sys 969499892 10918
 sys/man/6/regexp - 664 sys sys 954089523 2050
@@ -7724,7 +7724,7 @@ sys/man/8/apm - 664 sys sys 1017679308 1811
 sys/man/8/auth - 664 sys sys 1163208463 4227
 sys/man/8/boot - 664 sys sys 1165623055 8357
 sys/man/8/booting - 664 sys sys 1015024984 4136
-sys/man/8/cpurc - 664 sys sys 971455510 1275
+sys/man/8/cpurc - 664 sys sys 1174792133 1541
 sys/man/8/cron - 664 sys sys 1063858596 1867
 sys/man/8/dhcpd - 664 sys sys 1172959497 5572
 sys/man/8/disksim - 664 sys sys 1144150487 1476
@@ -7740,7 +7740,7 @@ sys/man/8/init - 664 sys sys 944959679 1430
 sys/man/8/ipconfig - 664 sys sys 1159419702 6170
 sys/man/8/ipserv - 664 sys sys 1095862383 4375
 sys/man/8/kfscmd - 664 sys sys 1068569797 4515
-sys/man/8/listen - 664 sys sys 1173736981 3562
+sys/man/8/listen - 664 sys sys 1174792129 3826
 sys/man/8/lp - 664 sys sys 954614702 2491
 sys/man/8/mk9660 - 664 sys sys 1104430379 3946
 sys/man/8/mkfs - 664 sys sys 1163208436 3414
@@ -7748,7 +7748,7 @@ sys/man/8/mkpaqfs - 664 sys sys 1018386778 892
 sys/man/8/mksacfs - 664 sys sys 964886843 710
 sys/man/8/mouse - 664 sys sys 971455511 2476
 sys/man/8/na - 664 sys sys 958527089 859
-sys/man/8/ndb - 664 sys sys 1174626196 12927
+sys/man/8/ndb - 664 sys sys 1174774024 13164
 sys/man/8/newuser - 664 sys sys 1116954242 2418
 sys/man/8/nfsserver - 664 sys sys 1163208425 3587
 sys/man/8/pcmcia - 664 sys sys 944959679 408
@@ -12676,7 +12676,7 @@ sys/src/cmd/ndb/convDNS2M.c - 664 sys sys 1174690184 6801
 sys/src/cmd/ndb/convM2DNS.c - 664 sys sys 1174690173 10779
 sys/src/cmd/ndb/cs.c - 664 sys sys 1163208159 33080
 sys/src/cmd/ndb/csquery.c - 664 sys sys 1174626119 1073
-sys/src/cmd/ndb/dblookup.c - 664 sys sys 1174690228 20863
+sys/src/cmd/ndb/dblookup.c - 664 sys sys 1174792290 20940
 sys/src/cmd/ndb/dn.c - 664 sys sys 1174690061 32609
 sys/src/cmd/ndb/dnarea.c - 664 sys sys 1174626121 2505
 sys/src/cmd/ndb/dnnotify.c - 664 sys sys 1174626121 3122

+ 8 - 0
dist/replica/plan9.log

@@ -47955,3 +47955,11 @@
 1174705205 2 c 386/bin/ndb/dnsdebug - 775 sys sys 1174704818 252154
 1174705205 3 c 386/bin/ndb/dnsquery - 775 sys sys 1174704818 64417
 1174705205 4 c 386/bin/ndb/dnstcp - 775 sys sys 1174704819 250526
+1174771806 0 c sys/man/3/ip - 664 sys sys 1174771711 22618
+1174771806 1 c sys/man/6/ndb - 664 sys sys 1174770884 6755
+1174771806 2 c sys/man/8/ndb - 664 sys sys 1174771540 13154
+1174775406 0 c sys/man/8/listen - 664 sys sys 1174773895 3727
+1174775406 1 c sys/man/8/ndb - 664 sys sys 1174774024 13164
+1174793406 0 c sys/man/8/cpurc - 664 sys sys 1174792133 1541
+1174793406 1 c sys/man/8/listen - 664 sys sys 1174792129 3826
+1174793406 2 c sys/src/cmd/ndb/dblookup.c - 664 sys sys 1174792290 20940

+ 1 - 0
sys/man/3/ip

@@ -587,6 +587,7 @@ struct Udphdr
 	uchar	rport[2];	/* remote port */
 	uchar	lport[2];	/* local port */
 };
+.EE
 .TP
 .B oldheaders
 .EX

+ 4 - 1
sys/man/6/ndb

@@ -233,7 +233,7 @@ in tuples for hosts that support the IL protocol
 .B dnsdomain
 a domain name that
 .I ndb/dns
-adds onto any unrooted names when doing a search
+adds onto any unrooted names when doing a search.
 There may be multiple
 .B dnsdomain
 pairs.
@@ -241,6 +241,9 @@ pairs.
 .B dns
 a DNS server to use (for DNS and DHCP)
 .TP
+.B @dns
+a DNS server to forward queries to when running as a resolver (for DNS)
+.TP
 .B ntp
 an NTP server to use (for DHCP)
 .TP

+ 33 - 12
sys/man/8/cpurc

@@ -1,10 +1,14 @@
-.TH CPURC 8 
+.TH CPURC 8
 .SH NAME
-cpurc, termrc \- boot script
+cpurc, cpurc.local, termrc, termrc.local \- boot scripts
 .SH SYNOPSIS
 .B cpurc
+.br
+.B cpurc.local
 .PP
 .B termrc
+.br
+.B termrc.local
 .SH DESCRIPTION
 After the kernel boots, it execs
 .B /boot
@@ -39,27 +43,44 @@ was executed and
 to a value suitable for parallel compilation in
 .IR mk (1).
 .PP
-These files should be edited by local installations
-to reflect the configuration of their systems.
 If an executable file
-.B /sys/lib/sysconfig/termrc/$sysname
+.B /bin/termrc.local
+exists,
+.I termrc
+will execute it.
+If an executable file
+.B /cfg/$sysname/termrc
 exists for the machine named
 .BR $sysname ,
 .I termrc
-will execute it as its last act.
+will execute it next.
 This action is suppressed, as is automatic initialization of the mouse and
 VGA on a PC, if the user is
 .BR none .
+These files should be edited by local installations
+to reflect the configuration of their systems.
+.PP
+On CPU servers, read
+.L cpurc
+for
+.L termrc
+in the previous paragraph.
 .SH FILES
-.TF /sys/lib/sysconfig/termrc
+.TF /cfg/$sysname/termrc
+.TP
+.B /cfg/$sysname/cpurc
+machine-specific boot script for
+.I cpurc
 .TP
-.B /sys/lib/sysconfig/termrc
-machine-specific configuration scripts for
-.IR termrc .
+.B /cfg/$sysname/termrc
+machine-specific boot script for
+.I termrc
 .SH SOURCE
-.B /rc/bin/cpurc
+.B /rc/bin/*rc
+.br
+.B /rc/bin/*rc.local
 .br
-.B /rc/bin/termrc
+.B /cfg/$sysname/*rc
 .SH "SEE ALSO"
 .IR srv (4),
 .IR namespace (6),

+ 17 - 5
sys/man/8/listen

@@ -1,6 +1,6 @@
 .TH LISTEN 8
 .SH NAME
-listen, listen1, il7, il9, il19, il565, il566, il17007, il17008, il17009, il17013, il17031, tcp7, tcp9, tcp19, tcp21, tcp23, tcp25, tcp53, tcp110, tcp113, tcp143, tcp513, tcp515, tcp564, tcp565, tcp566, tcp567, tcp993, tcp17007, tcp17009, tcp17013 \- listen for calls on a network device
+listen, listen1, il7, il9, il19, il565, il566, il17007, il17008, il17009, il17013, il17031, tcp7, tcp9, tcp19, tcp21, tcp22, tcp23, tcp25, tcp53, tcp110, tcp113, tcp143, tcp513, tcp515, tcp564, tcp565, tcp566, tcp567, tcp993, tcp1723, tcp17007, tcp17009, tcp17010, tcp17013 \- listen for calls on a network device
 .SH SYNOPSIS
 .B aux/listen
 .RB [ -q ]
@@ -86,11 +86,16 @@ like 17007, but serves the root of the tree, forgoing the negotiation for which
 .B il17009 tcp17009
 remote execution.
 .TP
-.B "il17013 tcp17013"
+.B "tcp17010"
 server for
 .IR cpu (1)
 command.
 .TP
+.B "il17013 tcp17013"
+server for old
+.IR cpu (1)
+command for compatibility with old clients.
+.TP
 .B il17031
 server for
 .IR ramfs (4).
@@ -101,9 +106,9 @@ report the address of the incoming call.
 .B tcp21
 FTP daemon
 .TP
-.B tcp515
-LP daemon; see
-.IR lp (8).
+.B tcp22
+.B ssh
+`secure shell' encrypted terminal connection or file transfer.
 .TP
 .B tcp23
 .B telnet
@@ -116,6 +121,10 @@ mail delivery.
 .B rlogin
 terminal connection.
 .TP
+.B tcp515
+LP daemon; see
+.IR lp (8).
+.TP
 .B il7 tcp7
 echo any bytes received (bit mirror)
 .TP
@@ -138,6 +147,9 @@ port (always reports
 .TP
 .B tcp567
 Plan 9 ticket service.
+.TP
+.B tcp1723
+PPTP (point-to-point tunnelling protocol) service.
 .PD
 .PP
 The following services are available in

+ 12 - 2
sys/man/8/ndb

@@ -284,16 +284,23 @@ particularly if they don't work very well.
 See `Straddling Server' below for details.
 .TP
 .B -r
+act as a resolver only:
 send `recursive' queries, asking the other servers
 to complete lookups.
+If present,
+.B /env/DNSSERVER
+must be a space-separated list of such DNS servers' IP addresses,
+otherwise optional
+.IR ndb (6)
+.B @dns
+attributes name DNS servers to forward queries to.
 .TP
 .B -R
 ignore the `recursive' bit on incoming requests.
 Do not complete lookups on behalf of remote systems.
 .TP
 .B -s
-also cache DNS answers in memory,
-and answer domain requests sent to UDP port 53.
+also answer domain requests sent to UDP port 53.
 .TP
 .B -x
 specifies the mount point of the
@@ -601,6 +608,9 @@ plan9.bell-labs.com ip	204.178.31.2
 .SH FILES
 .TF /lib/ndb/local.*xxx
 .TP
+.B /env/DNSSERVER
+resolver's DNS servers' IP addresses.
+.TP
 .B /lib/ndb/local
 first database file searched
 .TP

+ 3 - 3
sys/src/cmd/ndb/dblookup.c

@@ -730,7 +730,7 @@ db2cache(int doit)
 	unlock(&dblock);
 }
 
-extern uchar	ipaddr[IPaddrlen];
+extern uchar	ipaddr[IPaddrlen];	/* my ip address */
 
 /*
  *  get all my xxx
@@ -847,7 +847,7 @@ dnsservers(int class)
 	if(nsrp != nil)
 		return nsrp;
 
-	p = getenv("DNSSERVER");
+	p = getenv("DNSSERVER");		/* list of ip addresses */
 	if(p != nil){
 		buf = estrdup(p);
 		n = tokenize(buf, args, nelem(args));
@@ -855,7 +855,7 @@ dnsservers(int class)
 			addlocaldnsserver(dp, class, args[i], i);
 		free(buf);
 	} else {
-		t = lookupinfo("@dns");
+		t = lookupinfo("@dns");		/* @dns=ip1 @dns=ip2 ... */
 		if(t == nil)
 			return nil;
 		i = 0;