Changeset 740 for vendor/current/source3/libads/kerberos.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/libads/kerberos.c (modified) (10 diffs)

vendor/current/source3/libads/kerberos.c

@@ -12 +12 @@
    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,
    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, see <http://www.gnu.org/licenses/>.
@@ -23 +23 @@
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "smb_krb5.h"
+#include "../librpc/gen_ndr/ndr_misc.h"
+#include "libads/kerberos_proto.h"
+#include "secrets.h"
 
 #ifdef HAVE_KRB5
@@ -91 +95 @@
         data_blob_free(&edata);
 
-        ndr_err = ndr_pull_struct_blob_all(&unwrapped_edata, mem_ctx, NULL,
-                        &parsed_edata,
-                        (ndr_pull_flags_fn_t)ndr_pull_KRB5_EDATA_NTSTATUS);
+        ndr_err = ndr_pull_struct_blob_all(&unwrapped_edata, mem_ctx, 
+                &parsed_edata, (ndr_pull_flags_fn_t)ndr_pull_KRB5_EDATA_NTSTATUS);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                 data_blob_free(&unwrapped_edata);
@@ -191 +194 @@
                 goto out;
         }
-        
+
         if ((code = smb_krb5_parse_name(ctx, principal, &me))) {
                 goto out;
@@ -230 +233 @@
                 goto out;
         }
-        
+
         if ((code = krb5_cc_store_cred(ctx, cc, &my_creds))) {
                 goto out;
@@ -283 +286 @@
         }
         return code;
-}
-
-
-
-/* run kinit to setup our ccache */
-int ads_kinit_password(ADS_STRUCT *ads)
-{
-        char *s;
-        int ret;
-        const char *account_name;
-        fstring acct_name;
-
-        if (ads->auth.flags & ADS_AUTH_USER_CREDS) {
-                account_name = ads->auth.user_name;
-                goto got_accountname;
-        }
-
-        if ( IS_DC ) {
-                /* this will end up getting a ticket for DOMAIN@RUSTED.REA.LM */
-                account_name = lp_workgroup();
-        } else {
-                /* always use the sAMAccountName for security = domain */
-                /* global_myname()$@REA.LM */
-                if ( lp_security() == SEC_DOMAIN ) {
-                        fstr_sprintf( acct_name, "%s$", global_myname() );
-                        account_name = acct_name;
-                }
-                else 
-                        /* This looks like host/global_myname()@REA.LM */
-                        account_name = ads->auth.user_name;
-        }
-
- got_accountname:
-        if (asprintf(&s, "%s@%s", account_name, ads->auth.realm) == -1) {
-                return KRB5_CC_NOMEM;
-        }
-
-        if (!ads->auth.password) {
-                SAFE_FREE(s);
-                return KRB5_LIBOS_CANTREADPWD;
-        }
-        
-        ret = kerberos_kinit_password_ext(s, ads->auth.password, ads->auth.time_offset,
-                        &ads->auth.tgt_expire, NULL, NULL, False, False, ads->auth.renewable, 
-                        NULL);
-
-        if (ret) {
-                DEBUG(0,("kerberos_kinit_password %s failed: %s\n", 
-                         s, error_message(ret)));
-        }
-        SAFE_FREE(s);
-        return ret;
 }
 
@@ -349 +300 @@
                 return code;
         }
-  
+
         if (!cc_name) {
                 if ((code = krb5_cc_default(ctx, &cc))) {
@@ -592 +543 @@
         char *unparsed_name = NULL, *salt_princ_s = NULL;
         krb5_principal ret_princ = NULL;
-        
+
         /* lookup new key first */
 
         if ( (salt_princ_s = kerberos_secrets_fetch_des_salt()) == NULL ) {
-        
+
                 /* look under the old key.  If this fails, just use the standard key */
 
@@ -611 +562 @@
                 ret_princ = NULL;
         }
-        
+
         TALLOC_FREE(unparsed_name);
         SAFE_FREE(salt_princ_s);
-        
+
         return ret_princ;
 }
@@ -655 +606 @@
         if (smb_krb5_parse_name(context, princ_s, &princ) != 0) {
                 goto out;
-                
         }
         if (smb_krb5_unparse_name(talloc_tos(), context, princ, &unparsed_name) != 0) {