From 11e9de855ca84af8d34a5f6459f304fcfa72dca3 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 24 Mar 2003 11:25:34 +0000
Subject: Patch from metze to generalise POPT_COMMON_SAMBA, with some minor
 changes (This used to be commit 2ddfed298d7f0b6e690275725a39c3ef107077ae)

---
 source3/include/popt_common.h | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'source3/include/popt_common.h')

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;
 };
-- 
cgit