summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-12-28 19:48:59 +0000
committerJeremy Allison <jra@samba.org>2002-12-28 19:48:59 +0000
commitaf9599e3c4fa203421a34bef91ca4c8c2193077e (patch)
treee06a841bdb5c711bba227227b962248239b2a6ed
parente114e03d3ffe87e29cea3d35232f9527cffb01bf (diff)
downloadsamba-af9599e3c4fa203421a34bef91ca4c8c2193077e.tar.gz
samba-af9599e3c4fa203421a34bef91ca4c8c2193077e.tar.bz2
samba-af9599e3c4fa203421a34bef91ca4c8c2193077e.zip
Revert by Simo's request. HEAD and 3.0 should be in sync for
this except for the modules load. Jeremy. (This used to be commit 388cf136488bf92d057d23223dfcda9986681aee)
-rw-r--r--source3/utils/pdbedit.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index e4e3d1fcd6..2b356095c5 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -494,16 +494,8 @@ int main (int argc, char **argv)
poptGetArg(pc); /* Drop argv[0], the program name */
- if (user_name == NULL) {
- if (poptPeekArg(pc) == NULL) {
- fprintf(stderr, "Can't use pdbedit without a username\n");
- poptPrintHelp(pc, stderr, 0);
- exit(1);
- } else {
- /*Don't try to duplicate a null string */
- user_name = strdup(poptGetArg(pc));
- }
- }
+ if (user_name == NULL)
+ user_name = poptGetArg(pc);
if (!lp_load(dyn_CONFIGFILE,True,False,False)) {
fprintf(stderr, "Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE);