Author: metze Date: 2004-08-19 12:18:07 +0000 (Thu, 19 Aug 2004) New Revision: 1912
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=1912&nolog=1 Log: move popt_common.h metze Added: branches/SAMBA_4_0/source/lib/cmdline/popt_common.h Removed: branches/SAMBA_4_0/source/include/popt_common.h Modified: branches/SAMBA_4_0/source/include/rewrite.h Changeset: Deleted: branches/SAMBA_4_0/source/include/popt_common.h =================================================================== --- branches/SAMBA_4_0/source/include/popt_common.h 2004-08-19 12:16:48 UTC (rev 1911) +++ branches/SAMBA_4_0/source/include/popt_common.h 2004-08-19 12:18:07 UTC (rev 1912) @@ -1,51 +0,0 @@ -/* - Unix SMB/CIFS implementation. - Common popt arguments - Copyright (C) Jelmer Vernooij 2003 - - 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 - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. -*/ - -#ifndef _POPT_COMMON_H -#define _POPT_COMMON_H - -#include "popt.h" - -/* 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 -#define POPT_TABLEEND { NULL, '\0', 0, 0, 0, NULL, NULL } -#endif - -#define POPT_COMMON_SAMBA { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_samba, 0, "Common samba 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 cmdline_auth_info { - pstring username; - pstring password; - pstring domain; - BOOL got_pass; - BOOL use_kerberos; -}; - -extern struct cmdline_auth_info cmdline_auth_info; - -#endif /* _POPT_COMMON_H */ Modified: branches/SAMBA_4_0/source/include/rewrite.h =================================================================== --- branches/SAMBA_4_0/source/include/rewrite.h 2004-08-19 12:16:48 UTC (rev 1911) +++ branches/SAMBA_4_0/source/include/rewrite.h 2004-08-19 12:18:07 UTC (rev 1912) @@ -280,6 +280,6 @@ char *from_name, *to_name; } *smb_iconv_t; -#include "popt_common.h" +#include "lib/cmdline/popt_common.h" #endif /* _REWRITE_H */ Copied: branches/SAMBA_4_0/source/lib/cmdline/popt_common.h (from rev 1911, branches/SAMBA_4_0/source/include/popt_common.h)