Another smattering of static and const

(This used to be commit 897cc4a610932e596f8a9807213166e380ef0203)

7 files changed, 13 insertions, 13 deletions

diff --git a/source3/lib/util.c b/source3/lib/util.c
index bcef3013f9..ae94b710b2 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -100,7 +100,7 @@ char *tmpdir(void)
  Determine whether we are in the specified group.
 ****************************************************************************/
 
-BOOL in_group(gid_t group, gid_t current_gid, int ngroups, gid_t *groups)
+BOOL in_group(gid_t group, gid_t current_gid, int ngroups, const gid_t *groups)
 {
 	int i;
 
diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c
index 4739cfbf7a..a8754d1710 100644
--- a/source3/nsswitch/pam_winbind.c
+++ b/source3/nsswitch/pam_winbind.c
@@ -79,7 +79,7 @@ static int converse(pam_handle_t *pamh, int nargs,
 }
 
 
-int _make_remark(pam_handle_t * pamh, int type, const char *text)
+static int _make_remark(pam_handle_t * pamh, int type, const char *text)
 {
 	int retval = PAM_SUCCESS;
 
@@ -241,12 +241,12 @@ static char *_pam_delete(register char *xx)
  * obtain a password from the user
  */
 
-int _winbind_read_password(pam_handle_t * pamh
-			,unsigned int ctrl
-			,const char *comment
-			,const char *prompt1
-			,const char *prompt2
-			,const char **pass)
+static int _winbind_read_password(pam_handle_t * pamh
+				  ,unsigned int ctrl
+				  ,const char *comment
+				  ,const char *prompt1
+				  ,const char *prompt2
+				  ,const char **pass)
 {
 	int authtok_flag;
 	int retval;
diff --git a/source3/nsswitch/winbindd.c b/source3/nsswitch/winbindd.c
index 358d9add3a..fbeb6b6347 100644
--- a/source3/nsswitch/winbindd.c
+++ b/source3/nsswitch/winbindd.c
@@ -25,7 +25,7 @@
 
 /* List of all connected clients */
 
-struct winbindd_cli_state *client_list;
+static struct winbindd_cli_state *client_list;
 static int num_clients;
 BOOL opt_nocache = False;
 BOOL opt_dual_daemon = False;
diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c
index c34b4c1ad2..a62f7af1ad 100644
--- a/source3/torture/locktest.c
+++ b/source3/torture/locktest.c
@@ -136,7 +136,7 @@ static void show_locks(void)
 /***************************************************** 
 return a connection to a server
 *******************************************************/
-struct cli_state *connect_one(char *share, int snum)
+static struct cli_state *connect_one(char *share, int snum)
 {
 	struct cli_state *c;
 	struct nmb_name called, calling;
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index b30ab6f38e..5fa7e3be95 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -30,7 +30,7 @@ extern BOOL AllowDebugChange;
  Add all currently available users to another db
  ********************************************************/
 
-int export_database (struct pdb_context *in, char *db){
+static int export_database (struct pdb_context *in, char *db){
 	struct pdb_context *context;
 	SAM_ACCOUNT *user = NULL;
 
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index b6a13180a3..4f9df90fa2 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -29,7 +29,7 @@ static pstring owner_username;
 static fstring server;
 static int got_pass;
 static int test_args;
-TALLOC_CTX *ctx;
+static TALLOC_CTX *ctx;
 
 #define CREATE_ACCESS_READ READ_CONTROL_ACCESS
 #define CREATE_ACCESS_WRITE (WRITE_DAC_ACCESS | WRITE_OWNER_ACCESS)
diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index bcb460ee0b..b733f8112f 100644
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -32,7 +32,7 @@ struct user_auth_info {
 /* How low can we go? */
 
 enum tree_level {LEV_WORKGROUP, LEV_SERVER, LEV_SHARE};
-enum tree_level level = LEV_SHARE;
+static enum tree_level level = LEV_SHARE;
 
 static void usage(void)
 {