#includes, prototypes, etc

s/#endif lint/#endif/
sanity in extern and static vars

diff --git a/update/auth_001.c b/update/auth_001.c
index 9ff2bf6bc9850fe23da3769244feb3e6b0d62f8d..0b3bd368eac623d61f10c4936c77beb03f8bc33c 100644 (file)
--- a/update/auth_001.c
+++ b/update/auth_001.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static char *rcsid_auth_001_c = "$Header$";
-#endif lint
+#endif
 
 #include <mit-copyright.h>
 #include <stdio.h>
@@ -26,7 +26,7 @@ extern char buf[BUFSIZ];
 extern int have_authorization;
 extern struct sockaddr_in *client_address();
 extern CONNECTION conn;
-int code;
+extern int code;
 extern char *PrincipalHostname();
 static char service[] = "rcmd";
 static char master[] = "sms";

diff --git a/update/checksum.c b/update/checksum.c
index d806f98b09c6b8edf1cd5ce01bbb69ef19d98027..947b5c95e5d32d3b7133ea15f10b52eac98cb561 100644 (file)
--- a/update/checksum.c
+++ b/update/checksum.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static char *rcsid_checksum_c = "$Header$";
-#endif lint
+#endif
 
 #include <mit-copyright.h>
 #include <stdio.h>

diff --git a/update/client.c b/update/client.c
index 117b233be4e605a4f0abbedbc5a2dd8b775f73ad..1a0babaa7db1670ec7c3d0b316cecc47eaff9d3b 100644 (file)
--- a/update/client.c
+++ b/update/client.c
@@ -26,6 +26,7 @@ static char *rcsid_client2_c = "$Header$";
 
 #include <mit-copyright.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <gdb.h>
 #include <sys/param.h>
@@ -38,7 +39,6 @@ static char *rcsid_client2_c = "$Header$";
 #include <moira_site.h>
 #include <krb.h>
 
-extern char *malloc();
 extern int errno, dbg;
 
 static char buf[BUFSIZ];

diff --git a/update/exec_002.c b/update/exec_002.c
index 34c0cce49978a5a71f3c48fb23e054709b582f61..d492d92d1af6f7335eeff7b06406dd8de1425100 100644 (file)
--- a/update/exec_002.c
+++ b/update/exec_002.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static char *rcsid_exec_002_c = "$Header$";
-#endif lint
+#endif
 
 #include <mit-copyright.h>
 #include <stdio.h>
@@ -27,7 +27,7 @@ static char *rcsid_exec_002_c = "$Header$";
 #include "update.h"
 
 extern CONNECTION conn;
-extern int code, errno, uid;
+extern int code, errno, uid, log_priority;
 extern char *whoami;
 
 #if defined(vax) || defined(ibm032)

diff --git a/update/get_file.c b/update/get_file.c
index 17a2f97b60bbd4325d6cbf9b6d67696c3961b4ad..19fad0f2ce2794a3c9b6fe447e9650c73b09610d 100644 (file)
--- a/update/get_file.c
+++ b/update/get_file.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static char *rcsid_get_file_c = "$Header$";
-#endif lint
+#endif
 
 #include <mit-copyright.h>
 #include <stdio.h>
@@ -28,16 +28,17 @@ static char *rcsid_get_file_c = "$Header$";
 #endif /* MIN */
 
 extern CONNECTION conn;
-char buf[BUFSIZ];
+extern char buf[BUFSIZ];
 
 extern int code, errno, uid;
+extern char *whoami;
 
 extern int have_authorization, have_file, done;
 extern C_Block session;
 static des_key_schedule sched;
 static des_cblock ivec;
 
-int get_block();
+static int get_block();
 
 /*
  * get_file()

diff --git a/update/inst_001.c b/update/inst_001.c
index d2860346fe2cc4f5442aa5bc5c6ef761bbe273d7..6b02693e6156901e0b5ba912390a3858107f88eb 100644 (file)
--- a/update/inst_001.c
+++ b/update/inst_001.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static char *rcsid_inst_001_c = "$Header$";
-#endif lint
+#endif
 
 #include <mit-copyright.h>
 #include <stdio.h>

diff --git a/update/log.c b/update/log.c
index 415280e960f4871cd548fc42bb7f8123623beae5..05c2453cb8bfc95d684fb25e6f52b75724966410 100644 (file)
--- a/update/log.c
+++ b/update/log.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static char *rcsid_log_c = "$Header$";
-#endif lint
+#endif
 
 /*
  * handle logging for dcm and update server
@@ -24,13 +24,14 @@ static char *rcsid_log_c = "$Header$";
 #include <mit-copyright.h>
 #include <stdio.h>
 #include "com_err.h"
+#ifdef __STDC__
+#include <stdarg.h>
+#else
 #include <varargs.h>
-#include "update.h"
-#include <krb.h>
-
-#ifndef __STDC__
 #define const
 #endif
+#include "update.h"
+#include <krb.h>
 
 #ifdef use_syslog
 #include <syslog.h>
@@ -46,7 +47,7 @@ int syslog_prio[] = {
     LOG_ERR
 };
 #endif
-int log_priority;
+extern int log_priority;
 extern char *whoami;
 
 void mr_update_com_err_hook(whoami, code, fmt, args)

diff --git a/update/send_file.c b/update/send_file.c
index 0d524d2d0fd7295fa0e3e7c227b0349cfc7436c6..317bc2d9f4754d788df2fdef775651d1cbc6c224 100644 (file)
--- a/update/send_file.c
+++ b/update/send_file.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static char *rcsid_send_file_c = "$Header$";
-#endif lint
+#endif
 
 #include <mit-copyright.h>
 #include <stdio.h>

diff --git a/update/ticket.c b/update/ticket.c
index f07ed3267e707ea39fd6d7504a6833f0e82947e8..6e5f6d1d50cb0bcde880153b9121e59615f26727 100644 (file)
--- a/update/ticket.c
+++ b/update/ticket.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static char *rcsid_ticket_c = "$Header$";
-#endif lint
+#endif
 
 #include <mit-copyright.h>
 #include <stdio.h>
@@ -20,6 +20,8 @@ static char *rcsid_ticket_c = "$Header$";
 #include <com_err.h>
 #include <krb_et.h>
 
+extern char *whoami;
+
 /* too bad we can't set the pathname easily */
 static char *srvtab = KEYFILE; /* default == /etc/srvtab */
 static char realm[REALM_SZ];
@@ -53,7 +55,7 @@ get_mr_update_ticket(host, ticket)
 
      pass = 1;
      init();
-     strcpy(phost, krb_get_phost(host));
+     strcpy(phost, (char*)krb_get_phost(host));
  try_it:
      code = krb_mk_req(ticket, service, phost, realm, (long)0);
      if (code) {

diff --git a/update/update_server.c b/update/update_server.c
index 54c162e1a866e8ff6b41238e7088b6fb50825321..992cf51d8c7f907f464a3f1db3f918f4ef7ecb49 100644 (file)
--- a/update/update_server.c
+++ b/update/update_server.c
@@ -8,10 +8,11 @@
 
 #ifndef lint
 static char *rcsid_dispatch_c = "$Header$";
-#endif lint
+#endif
 
 #include <mit-copyright.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <gdb.h>
 #include <errno.h>
 #include <string.h>
@@ -32,14 +33,11 @@ extern int sync_proc(), quit();
 extern char *config_lookup();
 
 extern void gdb_debug();
-extern int abort(), errno;
-#ifndef sun
-extern int exit();
-#endif
+extern int errno;
 extern STRING instructions;
 
 CONNECTION conn;
-int code;
+int code, log_priority;
 char *whoami;
 
 int have_authorization = 0;
@@ -62,7 +60,7 @@ struct _dt {
      { "XFER_003", xfer_003 },
      { "EXEC_002", exec_002 },
      { "quit", quit },
-     { (char *)NULL, abort }
+     { (char *)NULL, (int (*)())abort }
 };
 
 /* general scratch space -- useful for building error messages et al... */
@@ -232,7 +230,7 @@ quit(str)
      (void) send_ok();
      sever_connection(conn);
      mr_log_info("Closing connection.");
-     return(exit(0));
+     exit(0);
 }
 
 

diff --git a/update/update_test.c b/update/update_test.c
index 28ae17c0f8cc09bade6d9448f08968dc16a5b45d..3cbf1499f3437673342cd71c9a41f09e7f87afd0 100644 (file)
--- a/update/update_test.c
+++ b/update/update_test.c
@@ -28,7 +28,6 @@
 CONNECTION conn;
 char *whoami;
 
-
 main(argc, argv)
 int argc;
 char **argv;
@@ -127,7 +126,6 @@ usage()
     exit(1);
 }
 
-static
 send_auth(host_name)
 char *host_name;
 {
@@ -171,7 +169,6 @@ char *host_name;
     return(MR_SUCCESS);
 }
 
-static
 execute(path)
     char *path;
 {

diff --git a/update/xfer_002.c b/update/xfer_002.c
index 9aab0bb96b173011abccf075420885721b7166df..553b734fe2628722cb0f4a87a9ca3cf59391f60f 100644 (file)
--- a/update/xfer_002.c
+++ b/update/xfer_002.c
@@ -8,7 +8,7 @@
 
 #ifndef lint
 static char *rcsid_xfer_002_c = "$Header$";
-#endif lint
+#endif
 
 #include <mit-copyright.h>
 #include <stdio.h>
@@ -20,7 +20,7 @@ static char *rcsid_xfer_002_c = "$Header$";
 #include <moira.h>
 
 extern CONNECTION conn;
-char buf[BUFSIZ];
+extern char buf[BUFSIZ];
 
 extern int code, errno;
 

diff --git a/update/xfer_003.c b/update/xfer_003.c
index 5974ae64c80a4f776ae37d5392526f757fe6b715..f1aa25924ce2a8b5d8dc064f2cc8849de3b3d48f 100644 (file)
--- a/update/xfer_003.c
+++ b/update/xfer_003.c
@@ -9,7 +9,7 @@
 
 #ifndef lint
 static char *rcsid_xfer_002_c = "$Header$";
-#endif lint
+#endif
 
 #include <mit-copyright.h>
 #include <stdio.h>
@@ -21,7 +21,7 @@ static char *rcsid_xfer_002_c = "$Header$";
 #include <moira.h>
 
 extern CONNECTION conn;
-char buf[BUFSIZ];
+extern char buf[BUFSIZ];
 
 extern int code, errno;