diff options
| -rw-r--r-- | source3/nsswitch/winbindd_cm.c | 6 | ||||
| -rw-r--r-- | source3/printing/print_cups.c | 3 | ||||
| -rw-r--r-- | source3/torture/locktest.c | 5 | ||||
| -rw-r--r-- | source3/torture/locktest2.c | 5 | ||||
| -rw-r--r-- | source3/torture/masktest.c | 7 |
5 files changed, 14 insertions, 12 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c index a18f5cf31b..0a0dc63bca 100644 --- a/source3/nsswitch/winbindd_cm.c +++ b/source3/nsswitch/winbindd_cm.c @@ -65,13 +65,14 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND -extern struct winbindd_methods reconnect_methods; - struct dc_name_ip { fstring name; struct in_addr ip; }; +extern struct winbindd_methods reconnect_methods; +extern BOOL override_logfile; + static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain); static void set_dc_type_and_flags( struct winbindd_domain *domain ); static BOOL get_dcs(TALLOC_CTX *mem_ctx, const struct winbindd_domain *domain, @@ -160,7 +161,6 @@ static void msg_try_to_go_online(int msg_type, struct process_id src, void *buf, static BOOL fork_child_dc_connect(struct winbindd_domain *domain) { - extern BOOL override_logfile; struct dc_name_ip *dcs = NULL; int num_dcs = 0; TALLOC_CTX *mem_ctx = NULL; diff --git a/source3/printing/print_cups.c b/source3/printing/print_cups.c index 138f58d0c8..2c942627c6 100644 --- a/source3/printing/print_cups.c +++ b/source3/printing/print_cups.c @@ -25,6 +25,7 @@ #include <cups/cups.h> #include <cups/language.h> +extern userdom_struct current_user_info; /* * 'cups_passwd_cb()' - The CUPS password callback... @@ -1006,7 +1007,6 @@ static int cups_queue_get(const char *sharename, static int cups_queue_pause(int snum) { - extern userdom_struct current_user_info; int ret = 1; /* Return value */ http_t *http = NULL; /* HTTP connection to server */ ipp_t *request = NULL, /* IPP Request */ @@ -1098,7 +1098,6 @@ static int cups_queue_pause(int snum) static int cups_queue_resume(int snum) { - extern userdom_struct current_user_info; int ret = 1; /* Return value */ http_t *http = NULL; /* HTTP connection to server */ ipp_t *request = NULL, /* IPP Request */ diff --git a/source3/torture/locktest.c b/source3/torture/locktest.c index c3200ca038..31fd0225f8 100644 --- a/source3/torture/locktest.c +++ b/source3/torture/locktest.c @@ -36,6 +36,9 @@ static unsigned min_length = 0; static BOOL exact_error_codes; static BOOL zero_zero; +extern char *optarg; +extern int optind; + #define FILENAME "\\locktest.dat" #define READ_PCT 50 @@ -581,8 +584,6 @@ static void usage(void) int main(int argc,char *argv[]) { char *share[NSERVERS]; - extern char *optarg; - extern int optind; int opt; char *p; int seed, server; diff --git a/source3/torture/locktest2.c b/source3/torture/locktest2.c index 5f2f2499ac..0a897fb206 100644 --- a/source3/torture/locktest2.c +++ b/source3/torture/locktest2.c @@ -29,6 +29,9 @@ static BOOL analyze; static BOOL hide_unlock_fails; static BOOL use_oplocks; +extern char *optarg; +extern int optind; + #define FILENAME "\\locktest.dat" #define LOCKRANGE 100 #define LOCKBASE 0 @@ -471,8 +474,6 @@ static void usage(void) int main(int argc,char *argv[]) { char *share1, *share2, *nfspath1, *nfspath2; - extern char *optarg; - extern int optind; int opt; char *p; int seed; diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c index 2ce59c86e6..f97fb97542 100644 --- a/source3/torture/masktest.c +++ b/source3/torture/masktest.c @@ -33,6 +33,10 @@ static int die_on_error; static int NumLoops = 0; static int ignore_dot_errors = 0; +extern char *optarg; +extern int optind; +extern BOOL AllowDebugChange; + /* a test fn for LANMAN mask support */ int ms_fnmatch_lanman_core(const char *pattern, const char *string) { @@ -426,9 +430,6 @@ static void usage(void) { char *share; struct cli_state *cli; - extern char *optarg; - extern int optind; - extern BOOL AllowDebugChange; int opt; char *p; int seed; |