Cosmetic (no functional changes):

o   Add missing $Id$s
o   Move extern decls from .c -> .h files
o   Staticize
o   Remove #includes from .h files
o   style(9)ify includes
o   bcopy -> memcpy
    bzero -> memset
    bcmp -> memcmp
    index -> strchr
    rindex -> strrchr
o   Move timeout.h -> timer.h (making it consistent w/ timer.c)
o   Add -Wmissing-prototypes

1 files changed, 15 insertions, 19 deletions

diff --git a/usr.sbin/ppp/server.c b/usr.sbin/ppp/server.c
index c756d77..4cc8f2e 100644
--- a/usr.sbin/ppp/server.c
+++ b/usr.sbin/ppp/server.c
@@ -1,23 +1,32 @@
-#include <sys/types.h>
-#include <sys/stat.h>
+/*
+ * $Id: $
+ */
+
+#include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <sys/un.h>
 #include <arpa/inet.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
-#include <string.h>
-#include <stdio.h>
+
 #include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/un.h>
 #include <unistd.h>
+
 #include "mbuf.h"
 #include "log.h"
 #include "loadalias.h"
+#include "command.h"
 #include "vars.h"
 #include "server.h"
+#include "log.h"
 #include "defs.h"
 
-int server = UNKNOWN_SERVER;
+int server = -2;
+
 static struct sockaddr_un ifsun;
 static char *rm;
 
@@ -131,16 +140,3 @@ ServerClose()
   }
   server = -1;
 }
-
-int
-ServerType()
-{
-  if (server == UNKNOWN_SERVER)
-    return UNKNOWN_SERVER;
-  else if (server == NO_SERVER)
-    return NO_SERVER;
-  else if (rm)
-    return LOCAL_SERVER;
-  else
-    return INET_SERVER;
-}