diff options
| author | Jeremy Allison <jra@samba.org> | 1998-11-07 05:32:37 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-11-07 05:32:37 +0000 |
| commit | 548b417d404a2653ebb5918b0c169ccdfafe856f (patch) | |
| tree | 9e76b99787bc8ac79d60ab770b86b8b84906ee89 /source3/utils/smbpasswd.c | |
| parent | f7580666de5fdd830178f97971d6fe3fa1238b34 (diff) | |
| download | samba-548b417d404a2653ebb5918b0c169ccdfafe856f.tar.gz samba-548b417d404a2653ebb5918b0c169ccdfafe856f.tar.bz2 samba-548b417d404a2653ebb5918b0c169ccdfafe856f.zip | |
codepages/codepage_def.936: Updated comment.
param/loadparm.c: Removed "networkstation user login", "domain controller", and "domain sid" parameters.
passdb/passdb.c: Removed "networkstation user login" code and changed bug test code
to only check once for a bad password server. This will stop the
complaints of many "bad login" audit records in NT PDC logs.
utils/smbpasswd.c: Removed check for "domain controller".
Jeremy.
(This used to be commit d6e6e936b5dd90dd8fc38d9404efbe5c546c15e5)
Diffstat (limited to 'source3/utils/smbpasswd.c')
| -rw-r--r-- | source3/utils/smbpasswd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c index 147e3492af..b27bbbbd3b 100644 --- a/source3/utils/smbpasswd.c +++ b/source3/utils/smbpasswd.c @@ -60,9 +60,9 @@ static int join_domain( char *domain, char *remote) domain if we are locally set up as a domain controller. */ - if(lp_domain_controller() && strequal(lp_workgroup(), domain)) { - fprintf(stderr, "%s: Cannot join domain %s as we already configured as \ -domain controller for that domain.\n", prog_name, domain); + if(strequal(remote, global_myname)) { + fprintf(stderr, "%s: Cannot join domain %s as the domain controller name is our own. \ +We cannot be a domain controller for a domain and also be a domain member.\n", prog_name, domain); return 1; } |