summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-03-24 14:15:14 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-03-24 14:15:14 +0000
commit41a09c3c533ab170097309e1f91314eda32e4f4c (patch)
treea914e40801ca3c51a0b00399ff8282542b6cc198 /source3/include
parente5ae6d548ff3c11a1be5ce3509da278b09994a34 (diff)
downloadsamba-41a09c3c533ab170097309e1f91314eda32e4f4c.tar.gz
samba-41a09c3c533ab170097309e1f91314eda32e4f4c.tar.bz2
samba-41a09c3c533ab170097309e1f91314eda32e4f4c.zip
Revoke some of the popt patch from metze I applied earlier today. It added
some double options and broke some parameters. (This used to be commit d5f9b0275c91512e1926504f22aaeec2d104430d)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/popt_common.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h
index 380df4860e..57850bf682 100644
--- a/source3/include/popt_common.h
+++ b/source3/include/popt_common.h
@@ -23,6 +23,8 @@
/* Common popt structures */
extern struct poptOption popt_common_samba[];
+extern struct poptOption popt_common_connection[];
+extern struct poptOption popt_common_version[];
extern struct poptOption popt_common_credentials[];
#ifndef POPT_TABLEEND
@@ -30,7 +32,9 @@ extern struct poptOption popt_common_credentials[];
#endif
#define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_samba, 0, "Common samba options:", NULL },
-#define POPT_CREDENTIALS { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_credentials, 0, "Authentication options:", NULL },
+#define POPT_COMMON_CONNECTION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_connection, 0, "Connection options:", NULL },
+#define POPT_COMMON_VERSION { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version, 0, "Common samba options:", NULL },
+#define POPT_COMMON_CREDENTIALS { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_credentials, 0, "Authentication options:", NULL },
struct user_auth_info {
pstring username;