summaryrefslogtreecommitdiff
path: root/source3/include
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2003-03-24 11:25:34 +0000
committerJelmer Vernooij <jelmer@samba.org>2003-03-24 11:25:34 +0000
commit11e9de855ca84af8d34a5f6459f304fcfa72dca3 (patch)
tree0eb5d0505a50136ed74a4207219c42b9d4996402 /source3/include
parent223828642548c7e25f6189e274aa1edcdfe30c4f (diff)
downloadsamba-11e9de855ca84af8d34a5f6459f304fcfa72dca3.tar.gz
samba-11e9de855ca84af8d34a5f6459f304fcfa72dca3.tar.bz2
samba-11e9de855ca84af8d34a5f6459f304fcfa72dca3.zip
Patch from metze to generalise POPT_COMMON_SAMBA, with some minor changes
(This used to be commit 2ddfed298d7f0b6e690275725a39c3ef107077ae)
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/popt_common.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/source3/include/popt_common.h b/source3/include/popt_common.h
index 9354e8734d..7cdbc98862 100644
--- a/source3/include/popt_common.h
+++ b/source3/include/popt_common.h
@@ -22,22 +22,15 @@
#define _POPT_COMMON_H
/* Common popt structures */
-extern struct poptOption popt_common_debug[];
-extern struct poptOption popt_common_configfile[];
-extern struct poptOption popt_common_socket_options[];
-extern struct poptOption popt_common_version[];
-extern struct poptOption popt_common_netbios_name[];
-extern struct poptOption popt_common_log_base[];
+extern struct poptOption popt_common_samba[];
extern struct poptOption popt_common_credentials[];
-extern struct poptOption popt_common_scope[];
-#define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version, 0, "Common samba options:", NULL },
+#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 },
struct user_auth_info {
pstring username;
pstring password;
- pstring workgroup;
BOOL got_pass;
BOOL use_kerberos;
};