diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-01-07 06:55:36 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-01-07 06:55:36 +0000 |
| commit | 171da4d78736730557a94b44af9f2d62081b80ba (patch) | |
| tree | ad74341f9d50a521baec09c65637b81b150a0891 /source3/smbd | |
| parent | 102e44e446035bdcc7611b8b556d0e20978fbb80 (diff) | |
| download | samba-171da4d78736730557a94b44af9f2d62081b80ba.tar.gz samba-171da4d78736730557a94b44af9f2d62081b80ba.tar.bz2 samba-171da4d78736730557a94b44af9f2d62081b80ba.zip | |
this looks like a big commit, but it isn't really :)
This fixes our netbios scope handling. We now have a 'netbios scope' option
in smb.conf and the scope option is removed from make_nmb_name()
this was prompted by a bug in our PDC finding code where it didn't append
the scope to the query of the '*' name.
(This used to be commit b563be824b8c3141c49558eced7829b48d4ab26f)
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/password.c | 1 | ||||
| -rw-r--r-- | source3/smbd/server.c | 10 |
2 files changed, 2 insertions, 9 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c index e7f7f2c039..44fbdfa8ec 100644 --- a/source3/smbd/password.c +++ b/source3/smbd/password.c @@ -28,7 +28,6 @@ extern struct in_addr ipzero; /* users from session setup */ static pstring session_users=""; -extern pstring scope; extern pstring global_myname; extern fstring global_myworkgroup; diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 716f555c65..79d37e5093 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -35,7 +35,6 @@ int last_message = -1; /* a useful macro to debug the last message processed */ #define LAST_MESSAGE() smb_fn_name(last_message) -extern pstring scope; extern int DEBUGLEVEL; extern pstring user_socket_options; @@ -478,7 +477,7 @@ static void usage(char *pname) { printf("Usage: %s [-DaoPh?V] [-d debuglevel] [-l log basename] [-p port]\n", pname); - printf(" [-O socket options] [-s services file] [-i scope]\n"); + printf(" [-O socket options] [-s services file]\n"); printf("\t-D Become a daemon\n"); printf("\t-a Append to log file (default)\n"); printf("\t-o Overwrite log file, don't append\n"); @@ -491,7 +490,6 @@ static void usage(char *pname) printf("\t-p port Listen on the specified port\n"); printf("\t-O socket options Socket options\n"); printf("\t-s services file. Filename of services file\n"); - printf("\t-i scope NetBIOS scope to use (default none)\n"); printf("\n"); } @@ -520,16 +518,12 @@ static void usage(char *pname) argc--; } - while ( EOF != (opt = getopt(argc, argv, "O:i:l:s:d:Dp:h?VPaof:")) ) + while ( EOF != (opt = getopt(argc, argv, "O:l:s:d:Dp:h?VPaof:")) ) switch (opt) { case 'O': pstrcpy(user_socket_options,optarg); break; - case 'i': - pstrcpy(scope,optarg); - break; - case 'P': { extern BOOL passive; |