(merge from 3.0)

More 'static' work.

Andrew Bartlett

diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index 328ca92727731f34f8deb5749d13c04940cc6f0e..12c748e5f2a5ced2726aa97c02f14cd23ec8e544 100644 (file)
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -954,7 +954,7 @@ char *get_peer_addr(int fd)
        return addr_buf;
 }
 
-char *get_socket_addr(int fd)
+static char *get_socket_addr(int fd)
 {
        struct sockaddr sa;
        struct sockaddr_in *sockin = (struct sockaddr_in *) (&sa);

diff --git a/source/smbd/server.c b/source/smbd/server.c
index 26e4021443ad21f7a3076aa5b948182309d6d369..e2ffe8cc9f75bae2d14a22a39ef50b9dd8c59ade 100644 (file)
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -22,7 +22,7 @@
 
 #include "includes.h"
 
-int am_parent = 1;
+static int am_parent = 1;
 
 /* the last message the was processed */
 int last_message = -1;