summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--appl/svc/auth.sh4
-rwxr-xr-xdis/svc/auth4
-rw-r--r--emu/Plan9/devsrv9.c2
-rw-r--r--include/version.h2
-rw-r--r--man/6/sbl7
-rw-r--r--os/port/lib.h1
6 files changed, 14 insertions, 6 deletions
diff --git a/appl/svc/auth.sh b/appl/svc/auth.sh
index 25c8d520..b5547af0 100644
--- a/appl/svc/auth.sh
+++ b/appl/svc/auth.sh
@@ -2,8 +2,8 @@
load std
or {ftest -e /net/dns} {ftest -e /env/emuhost} {ndb/dns}
or {ftest -e /net/cs} {ndb/cs}
-or {ftest -f /keydb/signerkey} {echo 'auth: need to use createsignerkey(8)' >[1=2]; exit nosignerkey}
-or {ftest -f /keydb/keys} {echo 'auth: need to create /keydb/keys' >[1=2]; exit nokeys}
+or {ftest -f /keydb/signerkey} {echo 'auth: need to use createsignerkey(8)' >[1=2]; raise nosignerkey}
+or {ftest -f /keydb/keys} {echo 'auth: need to create /keydb/keys' >[1=2]; raise nokeys}
and {auth/keyfs} {
listen -v -t -A 'tcp!*!inflogin' {auth/logind&}
listen -v -t -A 'tcp!*!infkey' {auth/keysrv&}
diff --git a/dis/svc/auth b/dis/svc/auth
index 25c8d520..b5547af0 100755
--- a/dis/svc/auth
+++ b/dis/svc/auth
@@ -2,8 +2,8 @@
load std
or {ftest -e /net/dns} {ftest -e /env/emuhost} {ndb/dns}
or {ftest -e /net/cs} {ndb/cs}
-or {ftest -f /keydb/signerkey} {echo 'auth: need to use createsignerkey(8)' >[1=2]; exit nosignerkey}
-or {ftest -f /keydb/keys} {echo 'auth: need to create /keydb/keys' >[1=2]; exit nokeys}
+or {ftest -f /keydb/signerkey} {echo 'auth: need to use createsignerkey(8)' >[1=2]; raise nosignerkey}
+or {ftest -f /keydb/keys} {echo 'auth: need to create /keydb/keys' >[1=2]; raise nokeys}
and {auth/keyfs} {
listen -v -t -A 'tcp!*!inflogin' {auth/logind&}
listen -v -t -A 'tcp!*!infkey' {auth/keysrv&}
diff --git a/emu/Plan9/devsrv9.c b/emu/Plan9/devsrv9.c
index 74c97588..78c2ff94 100644
--- a/emu/Plan9/devsrv9.c
+++ b/emu/Plan9/devsrv9.c
@@ -245,7 +245,7 @@ srv9open(Chan *c, int omode)
/* spawn exportfs */
args[0] = "exportfs";
- args[1] = "-dS";
+ args[1] = "-S";
args[2] = up->genbuf;
args[3] = nil;
if(pipe(fd) < 0)
diff --git a/include/version.h b/include/version.h
index 1706a201..8763c132 100644
--- a/include/version.h
+++ b/include/version.h
@@ -1 +1 @@
-#define VERSION "Fourth Edition (20070202)"
+#define VERSION "Fourth Edition (20070213)"
diff --git a/man/6/sbl b/man/6/sbl
index 4b3dad88..9e147f4e 100644
--- a/man/6/sbl
+++ b/man/6/sbl
@@ -142,6 +142,7 @@ Each entry describes a
m \fImodule\fP \en \fIsrc\fP
A \fItype\fP
C \fItype\fP
+ F \fIfn-name\fP \fItype\fP
L \fItype\fP
R \fItype\fP
n
@@ -184,6 +185,12 @@ C
.B chan of
.I type
.TP
+.B
+F
+.B fn
+returning
+.I type
+.TP
.B f
.B real
.TP
diff --git a/os/port/lib.h b/os/port/lib.h
index 0233dc72..d6af4fa5 100644
--- a/os/port/lib.h
+++ b/os/port/lib.h
@@ -160,6 +160,7 @@ typedef struct Qid Qid;
typedef struct Dir Dir;
typedef struct Waitmsg Waitmsg;
+#define STATMAX 65535U /* max length of machine-independent stat structure */
#define ERRMAX 128 /* max length of error string */
#define KNAMELEN 28 /* max length of name held in kernel */