fix build on sles8 and other old popt installations

[ira/wip.git] / source4 / lib / cmdline / popt_common.h

diff --git a/source4/lib/cmdline/popt_common.h b/source4/lib/cmdline/popt_common.h
index e41b1a2cf4e4afb179cfb2240f9a28707b44180b..2f4ab2c1786e84261e7ecfdea7b0e46619d9e197 100644 (file)
--- a/source4/lib/cmdline/popt_common.h
+++ b/source4/lib/cmdline/popt_common.h
@@ -5,7 +5,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,14 +14,13 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _POPT_COMMON_H
 #define _POPT_COMMON_H
 
-#include "popt.h"
+#include <popt.h>
 
 /* Common popt structures */
 extern struct poptOption popt_common_samba[];
@@ -38,14 +37,9 @@ extern struct poptOption popt_common_credentials[];
 #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 cmdline_auth_info {
-       pstring username;
-       pstring password;
-       pstring domain;
-       BOOL got_pass;
-       BOOL use_kerberos;
-};
+extern struct cli_credentials *cmdline_credentials;
+extern struct loadparm_context *cmdline_lp_ctx;
 
-extern struct cmdline_auth_info cmdline_auth_info;
+void popt_common_dont_ask(void);
 
 #endif /* _POPT_COMMON_H */