svn commit: samba r10982 - in branches/SAMBA_4_0/source:
auth/credentials include
abartlet at samba.org
abartlet at samba.org
Fri Oct 14 04:04:53 GMT 2005
Author: abartlet
Date: 2005-10-14 04:04:52 +0000 (Fri, 14 Oct 2005)
New Revision: 10982
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=10982
Log:
Move credentials.h into auth/credentials, and add flags needed by
previous patch.
Andrew Bartlett
Added:
branches/SAMBA_4_0/source/auth/credentials/credentials.h
Removed:
branches/SAMBA_4_0/source/include/credentials.h
Modified:
branches/SAMBA_4_0/source/include/includes.h
Changeset:
Copied: branches/SAMBA_4_0/source/auth/credentials/credentials.h (from rev 10977, branches/SAMBA_4_0/source/include/credentials.h)
===================================================================
--- branches/SAMBA_4_0/source/include/credentials.h 2005-10-13 23:03:30 UTC (rev 10977)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials.h 2005-10-14 04:04:52 UTC (rev 10982)
@@ -0,0 +1,81 @@
+/*
+ samba -- Unix SMB/CIFS implementation.
+
+ Client credentials structure
+
+ Copyright (C) Jelmer Vernooij 2004-2005
+ Copyright (C) Andrew Bartlett <abartlet at samba.org> 2005
+
+ 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.
+*/
+
+struct ccache_container;
+
+/* In order of priority */
+enum credentials_obtained {
+ CRED_UNINITIALISED = 0, /* We don't even have a guess yet */
+ CRED_GUESS_ENV, /* Current value should be used, which was guessed */
+ CRED_CALLBACK, /* Callback should be used to obtain value */
+ CRED_GUESS_FILE, /* A guess from a file (or file pointed at in env variable) */
+ CRED_SPECIFIED /* Was explicitly specified on the command-line */
+};
+
+#define CLI_CRED_NTLM2 0x01
+#define CLI_CRED_NTLMv2_AUTH 0x02
+#define CLI_CRED_LANMAN_AUTH 0x04
+#define CLI_CRED_NTLM_AUTH 0x08
+
+struct cli_credentials {
+ /* Preferred methods, NULL means default */
+ const char **preferred_methods;
+
+ enum credentials_obtained workstation_obtained;
+ enum credentials_obtained username_obtained;
+ enum credentials_obtained password_obtained;
+ enum credentials_obtained domain_obtained;
+ enum credentials_obtained realm_obtained;
+ enum credentials_obtained ccache_obtained;
+ enum credentials_obtained principal_obtained;
+
+ const char *workstation;
+ const char *username;
+ const char *password;
+ const char *domain;
+ const char *realm;
+ const char *principal;
+
+ struct samr_Password *nt_hash;
+
+ struct ccache_container *ccache;
+
+ const char *(*workstation_cb) (struct cli_credentials *);
+ const char *(*password_cb) (struct cli_credentials *);
+ const char *(*username_cb) (struct cli_credentials *);
+ const char *(*domain_cb) (struct cli_credentials *);
+ const char *(*realm_cb) (struct cli_credentials *);
+ const char *(*principal_cb) (struct cli_credentials *);
+
+ /* Private handle for the callback routines to use */
+ void *priv_data;
+
+ struct creds_CredentialState *netlogon_creds;
+ enum netr_SchannelType secure_channel_type;
+ int kvno;
+
+ /* We are flagged to get machine account details from the
+ * secrets.ldb when we are asked for a username or password */
+
+ BOOL machine_account_pending;
+};
Deleted: branches/SAMBA_4_0/source/include/credentials.h
===================================================================
--- branches/SAMBA_4_0/source/include/credentials.h 2005-10-14 03:57:35 UTC (rev 10981)
+++ branches/SAMBA_4_0/source/include/credentials.h 2005-10-14 04:04:52 UTC (rev 10982)
@@ -1,76 +0,0 @@
-/*
- samba -- Unix SMB/CIFS implementation.
-
- Client credentials structure
-
- Copyright (C) Jelmer Vernooij 2004-2005
- Copyright (C) Andrew Bartlett <abartlet at samba.org> 2005
-
- 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.
-*/
-
-struct ccache_container;
-
-/* In order of priority */
-enum credentials_obtained {
- CRED_UNINITIALISED = 0, /* We don't even have a guess yet */
- CRED_GUESS_ENV, /* Current value should be used, which was guessed */
- CRED_CALLBACK, /* Callback should be used to obtain value */
- CRED_GUESS_FILE, /* A guess from a file (or file pointed at in env variable) */
- CRED_SPECIFIED /* Was explicitly specified on the command-line */
-};
-
-struct cli_credentials {
- /* Preferred methods, NULL means default */
- const char **preferred_methods;
-
- enum credentials_obtained workstation_obtained;
- enum credentials_obtained username_obtained;
- enum credentials_obtained password_obtained;
- enum credentials_obtained domain_obtained;
- enum credentials_obtained realm_obtained;
- enum credentials_obtained ccache_obtained;
- enum credentials_obtained principal_obtained;
-
- const char *workstation;
- const char *username;
- const char *password;
- const char *domain;
- const char *realm;
- const char *principal;
-
- struct samr_Password *nt_hash;
-
- struct ccache_container *ccache;
-
- const char *(*workstation_cb) (struct cli_credentials *);
- const char *(*password_cb) (struct cli_credentials *);
- const char *(*username_cb) (struct cli_credentials *);
- const char *(*domain_cb) (struct cli_credentials *);
- const char *(*realm_cb) (struct cli_credentials *);
- const char *(*principal_cb) (struct cli_credentials *);
-
- /* Private handle for the callback routines to use */
- void *priv_data;
-
- struct creds_CredentialState *netlogon_creds;
- enum netr_SchannelType secure_channel_type;
- int kvno;
-
- /* We are flagged to get machine account details from the
- * secrets.ldb when we are asked for a username or password */
-
- BOOL machine_account_pending;
-};
Modified: branches/SAMBA_4_0/source/include/includes.h
===================================================================
--- branches/SAMBA_4_0/source/include/includes.h 2005-10-14 03:57:35 UTC (rev 10981)
+++ branches/SAMBA_4_0/source/include/includes.h 2005-10-14 04:04:52 UTC (rev 10982)
@@ -113,7 +113,7 @@
#include "ntvfs/ntvfs.h"
#include "cli_context.h"
#include "lib/com/com.h"
-#include "credentials.h"
+#include "auth/credentials/credentials.h"
/***** automatically generated prototypes *****/
#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
More information about the samba-cvs
mailing list