Changeset 745 for trunk/server/source4/auth/credentials/credentials.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/auth/credentials/credentials.c (modified) (13 diffs)

trunk/server/source4/auth/credentials/credentials.c

@@ -25 +25 @@
 #include "librpc/gen_ndr/samr.h" /* for struct samrPassword */
 #include "auth/credentials/credentials.h"
-#include "auth/credentials/credentials_krb5.h"
-#include "auth/credentials/credentials_proto.h"
 #include "libcli/auth/libcli_auth.h"
 #include "lib/events/events.h"
 #include "param/param.h"
+
 
 /**
@@ -38 +37 @@
 {
         struct cli_credentials *cred = talloc(mem_ctx, struct cli_credentials);
-        if (!cred) {
+        if () {
                 return cred;
         }
 
-        cred->netlogon_creds = NULL;
-        cred->machine_account_pending = false;
         cred->workstation_obtained = CRED_UNINITIALISED;
         cred->username_obtained = CRED_UNINITIALISED;
@@ -51 +48 @@
         cred->ccache_obtained = CRED_UNINITIALISED;
         cred->client_gss_creds_obtained = CRED_UNINITIALISED;
+
+
         cred->server_gss_creds_obtained = CRED_UNINITIALISED;
-        cred->keytab_obtained = CRED_UNINITIALISED;
-        cred->principal_obtained = CRED_UNINITIALISED;
 
         cred->ccache_threshold = CRED_UNINITIALISED;
         cred->client_gss_creds_threshold = CRED_UNINITIALISED;
 
+
+
+
         cred->old_password = NULL;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         cred->smb_krb5_context = NULL;
-        cred->salt_principal = NULL;
+
+        cred->machine_account_pending = false;
+        cred->machine_account_pending_lp_ctx = NULL;
+
         cred->machine_account = false;
 
-        cred->bind_dn = NULL;
-
         cred->tries = 3;
+
         cred->callback_running = false;
 
         cli_credentials_set_kerberos_state(cred, CRED_AUTO_USE_KERBEROS);
         cli_credentials_set_gensec_features(cred, 0);
+
 
         return cred;
@@ -94 +134 @@
 }
 
+
+
+
+
+
+
 _PUBLIC_ enum credentials_use_kerberos cli_credentials_get_kerberos_state(struct cli_credentials *creds)
 {
         return creds->use_kerberos;
+
+
+
+
+
 }
 
@@ -185 +236 @@
  * @note Return value will never be NULL except by programmer error.
  */
-_PUBLIC_ const char *cli_credentials_get_principal(struct cli_credentials *cred, TALLOC_CTX *mem_ctx)
+)
 {
         if (cred->machine_account_pending) {
@@ -201 +252 @@
         }
 
-        if (cred->principal_obtained < cred->username_obtained) {
+        if (cred->principal_obtained < cred->username_obtained
+            || cred->principal_obtained < MAX(cred->domain_obtained, cred->realm_obtained)) {
                 if (cred->domain_obtained > cred->realm_obtained) {
+
                         return talloc_asprintf(mem_ctx, "%s@%s", 
                                                cli_credentials_get_username(cred),
                                                cli_credentials_get_domain(cred));
                 } else {
+
                         return talloc_asprintf(mem_ctx, "%s@%s", 
                                                cli_credentials_get_username(cred),
@@ -212 +266 @@
                 }
         }
+
         return talloc_reference(mem_ctx, cred->principal);
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -614 +681 @@
 {
         cli_credentials_set_username(cred, "", CRED_UNINITIALISED);
-        cli_credentials_set_domain(cred, lp_workgroup(lp_ctx), CRED_UNINITIALISED);
-        cli_credentials_set_workstation(cred, lp_netbios_name(lp_ctx), CRED_UNINITIALISED);
-        cli_credentials_set_realm(cred, lp_realm(lp_ctx), CRED_UNINITIALISED);
+        cli_credentials_set_domain(cred, lp_workgroup(lp_ctx), CRED_UNINITIALISED);
+        cli_credentials_set_workstation(cred, lp_netbios_name(lp_ctx), CRED_UNINITIALISED);
+        cli_credentials_set_realm(cred, lp_realm(lp_ctx), CRED_UNINITIALISED);
 }
 
@@ -629 +696 @@
 {
         char *p;
+
 
         if (lp_ctx != NULL) {
@@ -660 +728 @@
         
         if (cli_credentials_get_kerberos_state(cred) != CRED_DONT_USE_KERBEROS) {
-                cli_credentials_set_ccache(cred, event_context_find(cred), lp_ctx, NULL, CRED_GUESS_FILE);
+                cli_credentials_set_ccache(cred, lp_ctx, NULL, CRED_GUESS_FILE,
+                                           &error_string);
         }
 }
@@ -691 +760 @@
 {
         cred->secure_channel_type = secure_channel_type;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -723 +811 @@
         const char *username;
         
+
+
+
+
+
         if (cred->machine_account_pending) {
                 cli_credentials_set_machine_account(cred,
@@ -760 +853 @@
         return (cred->tries > 0);
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+