diff options
| author | bubulle <bubulle@alioth.debian.org> | 2008-11-01 11:09:46 +0000 |
|---|---|---|
| committer | bubulle <bubulle@alioth.debian.org> | 2008-11-01 11:09:46 +0000 |
| commit | a2b71a0141763c20552bb45eeb4cb78c4b513118 (patch) | |
| tree | 85b64d98387145ea4e00c1b529e1820542a979a3 /source/lib/popt_common.c | |
| parent | 2203bd59918d6d70515f9dad601cb5c0ef098092 (diff) | |
| download | samba-a2b71a0141763c20552bb45eeb4cb78c4b513118.tar.gz | |
Revert the merge of 3.3.0~pre2 in upstream branch
git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@2200 fc4039ab-9d04-0410-8cac-899223bdd6b0
Diffstat (limited to 'source/lib/popt_common.c')
| -rw-r--r-- | source/lib/popt_common.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/source/lib/popt_common.c b/source/lib/popt_common.c index 8ceac26bf2..25e41ab5f3 100644 --- a/source/lib/popt_common.c +++ b/source/lib/popt_common.c @@ -171,12 +171,6 @@ struct poptOption popt_common_version[] = { POPT_TABLEEND }; -struct poptOption popt_common_debuglevel[] = { - { NULL, 0, POPT_ARG_CALLBACK, (void *)popt_common_callback }, - { "debuglevel", 'd', POPT_ARG_STRING, NULL, 'd', "Set debug level", "DEBUGLEVEL" }, - POPT_TABLEEND -}; - /* Handle command line options: * --sbindir @@ -184,7 +178,6 @@ struct poptOption popt_common_debuglevel[] = { * --swatdir * --lmhostsfile * --libdir - * --modulesdir * --shlibext * --lockdir * --piddir @@ -198,7 +191,6 @@ enum dyn_item{ DYN_SWATDIR, DYN_LMHOSTSFILE, DYN_LIBDIR, - DYN_MODULESDIR, DYN_SHLIBEXT, DYN_LOCKDIR, DYN_PIDDIR, @@ -244,12 +236,6 @@ static void popt_dynconfig_callback(poptContext con, } break; - case DYN_MODULESDIR: - if (arg) { - set_dyn_MODULESDIR(arg); - } - break; - case DYN_SHLIBEXT: if (arg) { set_dyn_SHLIBEXT(arg); @@ -297,8 +283,6 @@ const struct poptOption popt_common_dynconfig[] = { "Path to lmhosts file", "LMHOSTSFILE" }, { "libdir", '\0' , POPT_ARG_STRING, NULL, DYN_LIBDIR, "Path to shared library directory", "LIBDIR" }, - { "modulesdir", '\0' , POPT_ARG_STRING, NULL, DYN_MODULESDIR, - "Path to shared modules directory", "MODULESDIR" }, { "shlibext", '\0' , POPT_ARG_STRING, NULL, DYN_SHLIBEXT, "Shared library extension", "SHLIBEXT" }, { "lockdir", '\0' , POPT_ARG_STRING, NULL, DYN_LOCKDIR, |