Changeset 740 for vendor/current/source3/libnet/libnet_dssync_keytab.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/libnet/libnet_dssync_keytab.c (modified) (9 diffs)

vendor/current/source3/libnet/libnet_dssync_keytab.c

@@ -20 +20 @@
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "smb_krb5.h"
+#include "ads.h"
+#include "libnet/libnet_dssync.h"
+#include "libnet/libnet_keytab.h"
 #include "librpc/gen_ndr/ndr_drsblobs.h"
 
-#if defined(HAVE_ADS) && defined(ENCTYPE_ARCFOUR_HMAC)
+#if defined(HAVE_ADS)
 
 static NTSTATUS keytab_startup(struct dssync_context *ctx, TALLOC_CTX *mem_ctx,
@@ -53 +56 @@
                 old_utdv = talloc(mem_ctx, struct replUpToDateVectorBlob);
 
-                ndr_err = ndr_pull_struct_blob(&entry->password, old_utdv,
-                                NULL, old_utdv,
+                ndr_err = ndr_pull_struct_blob(&entry->password, old_utdv, old_utdv,
                                 (ndr_pull_flags_fn_t)ndr_pull_replUpToDateVectorBlob);
                 if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -92 +94 @@
                 }
 
-                ndr_err = ndr_push_struct_blob(&blob, mem_ctx, NULL, new_utdv,
+                ndr_err = ndr_push_struct_blob(&blob, mem_ctx, new_utdv,
                                 (ndr_push_flags_fn_t)ndr_push_replUpToDateVectorBlob);
                 if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -147 +149 @@
         uint32_t j;
 
-        ndr_err = ndr_pull_struct_blob_all(blob, mem_ctx, NULL, &scb,
+        ndr_err = ndr_pull_struct_blob_all(blob, mem_ctx, &scb,
                         (ndr_pull_flags_fn_t)ndr_pull_supplementalCredentialsBlob);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -204 +206 @@
                 goto done;
         }
-        ndr_err = ndr_pull_struct_blob(&scpk_blob, mem_ctx, NULL, pkb,
+        ndr_err = ndr_pull_struct_blob(&scpk_blob, mem_ctx, pkb,
                         (ndr_pull_flags_fn_t)ndr_pull_package_PrimaryKerberosBlob);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -272 +274 @@
                 attr = &cur->object.attribute_ctr.attributes[i];
 
-                if (attr->attid == DRSUAPI_ATTRIBUTE_servicePrincipalName) {
+                if (attr->attid == DRSUAPI_ATT_servicePrincipalName) {
                         uint32_t count;
                         num_spns = attr->value_ctr.num_values;
@@ -296 +298 @@
 
                 switch (attr->attid) {
-                        case DRSUAPI_ATTRIBUTE_unicodePwd:
+                        case DRSUAPI_ATT_unicodePwd:
 
                                 if (blob->length != 16) {
@@ -317 +319 @@
                                 kvno = cur->meta_data_ctr->meta_data[i].version;
                                 break;
-                        case DRSUAPI_ATTRIBUTE_ntPwdHistory:
+                        case DRSUAPI_ATT_ntPwdHistory:
                                 pwd_history_len = blob->length / 16;
                                 pwd_history = blob->data;
                                 break;
-                        case DRSUAPI_ATTRIBUTE_userPrincipalName:
+                        case DRSUAPI_ATT_userPrincipalName:
                                 pull_string_talloc(mem_ctx, NULL, 0, &upn,
                                                    blob->data, blob->length,
                                                    STR_UNICODE);
                                 break;
-                        case DRSUAPI_ATTRIBUTE_sAMAccountName:
+                        case DRSUAPI_ATT_sAMAccountName:
                                 pull_string_talloc(mem_ctx, NULL, 0, &name,
                                                    blob->data, blob->length,
                                                    STR_UNICODE);
                                 break;
-                        case DRSUAPI_ATTRIBUTE_sAMAccountType:
+                        case DRSUAPI_ATT_sAMAccountType:
                                 sam_type = IVAL(blob->data, 0);
                                 break;
-                        case DRSUAPI_ATTRIBUTE_userAccountControl:
+                        case DRSUAPI_ATT_userAccountControl:
                                 uacc = IVAL(blob->data, 0);
                                 break;
-                        case DRSUAPI_ATTRIBUTE_supplementalCredentials:
+                        case DRSUAPI_ATT_supplementalCredentials:
                                 status = parse_supplemental_credentials(mem_ctx,
                                                                         blob,
@@ -600 +602 @@
         return NT_STATUS_NOT_SUPPORTED;
 }
-#endif /* defined(HAVE_ADS) && defined(ENCTYPE_ARCFOUR_HMAC) */
+#endif /* defined(HAVE_ADS) */
 
 const struct dssync_ops libnet_dssync_keytab_ops = {