Changeset 740 for vendor/current/source3/libnet

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source3/libnet

Files:

• libnet.h (deleted)
• libnet_dssync.c (modified) (19 diffs)
• libnet_dssync.h (modified) (3 diffs)
• libnet_dssync_keytab.c (modified) (9 diffs)
• libnet_dssync_passdb.c (added)
• libnet_join.c (modified) (46 diffs)
• libnet_join.h (added)
• libnet_keytab.c (modified) (1 diff)
• libnet_keytab.h (modified) (1 diff)
• libnet_proto.h (deleted)
• libnet_samsync.c (modified) (11 diffs)
• libnet_samsync.h (modified) (3 diffs)
• libnet_samsync_display.c (modified) (3 diffs)
• libnet_samsync_keytab.c (modified) (6 diffs)
• libnet_samsync_ldif.c (modified) (2 diffs)
• libnet_samsync_passdb.c (modified) (14 diffs)

vendor/current/source3/libnet/libnet_dssync.c

@@ -22 +22 @@
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "libnet/libnet_dssync.h"
+#include "rpc_client/cli_pipe.h"
 #include "../libcli/drsuapi/drsuapi.h"
-#include "../librpc/gen_ndr/cli_drsuapi.h"
+#include "../librpc/gen_ndr/ndr_drsuapi_c.h"
 
 /****************************************************************
@@ -31 +32 @@
 static int libnet_dssync_free_context(struct dssync_context *ctx)
 {
+        WERROR result;
+        struct dcerpc_binding_handle *b;
+
         if (!ctx) {
                 return 0;
@@ -36 +40 @@
 
         if (is_valid_policy_hnd(&ctx->bind_handle) && ctx->cli) {
-                rpccli_drsuapi_DsUnbind(ctx->cli, ctx, &ctx->bind_handle, NULL);
+                b = ctx->cli->binding_handle;
+                dcerpc_drsuapi_DsUnbind(b, ctx, &ctx->bind_handle, &result);
         }
 
@@ -125 +130 @@
         struct drsuapi_DsBindInfoCtr bind_info;
         struct drsuapi_DsBindInfo28 info28;
+        struct dcerpc_binding_handle *b = ctx->cli->binding_handle;
 
         ZERO_STRUCT(info28);
@@ -165 +171 @@
         bind_info.info.info28 = info28;
 
-        status = rpccli_drsuapi_DsBind(ctx->cli, mem_ctx,
+        status = dcerpc_drsuapi_DsBind(b, mem_ctx,
                                        &bind_guid,
                                        &bind_info,
@@ -219 +225 @@
         NTSTATUS status;
         WERROR werr;
-        int32_t level = 1;
+        uint32_t level = 1;
         union drsuapi_DsNameRequest req;
-        int32_t level_out;
+        uint32_t level_out;
         struct drsuapi_DsNameString names[1];
         union drsuapi_DsNameCtr ctr;
+        struct dcerpc_binding_handle *b = ctx->cli->binding_handle;
 
         names[0].str = talloc_asprintf(mem_ctx, "%s\\", ctx->domain_name);
@@ -236 +243 @@
         req.req1.format_desired = DRSUAPI_DS_NAME_FORMAT_FQDN_1779;
 
-        status = rpccli_drsuapi_DsCrackNames(ctx->cli, mem_ctx,
+        status = dcerpc_drsuapi_DsCrackNames(b, mem_ctx,
                                              &ctx->bind_handle,
                                              level,
@@ -246 +253 @@
                 ctx->error_message = talloc_asprintf(ctx,
                         "Failed to lookup DN for domain name: %s",
+                        get_friendly_nt_error_msg(status));
+                return status;
+        }
+
+        if (!W_ERROR_IS_OK(werr)) {
+                ctx->error_message = talloc_asprintf(ctx,
+                        "Failed to lookup DN for domain name: %s",
                         get_friendly_werror_msg(werr));
-                return status;
-        }
-
-        if (!W_ERROR_IS_OK(werr)) {
                 return werror_to_ntstatus(werr);
         }
@@ -301 +311 @@
                                             const char *dn,
                                             struct replUpToDateVectorBlob *utdv,
-                                            int32_t *plevel,
+                                            uint32_t *plevel,
                                             union drsuapi_DsGetNCChangesRequest *preq)
 {
         NTSTATUS status;
         uint32_t count;
-        int32_t level;
+        uint32_t level;
         union drsuapi_DsGetNCChangesRequest req;
         struct dom_sid null_sid;
@@ -313 +323 @@
         struct drsuapi_DsReplicaCursorCtrEx *cursors = NULL;
 
-        uint32_t replica_flags  = DRSUAPI_DS_REPLICA_NEIGHBOUR_WRITEABLE |
-                                  DRSUAPI_DS_REPLICA_NEIGHBOUR_SYNC_ON_STARTUP |
-                                  DRSUAPI_DS_REPLICA_NEIGHBOUR_DO_SCHEDULED_SYNCS |
-                                  DRSUAPI_DS_REPLICA_NEIGHBOUR_RETURN_OBJECT_PARENTS |
-                                  DRSUAPI_DS_REPLICA_NEIGHBOUR_NEVER_SYNCED;
+        uint32_t replica_flags  = DRSUAPI_DRS_WRIT_REP |
+                                  DRSUAPI_DRS_INIT_SYNC |
+                                  DRSUAPI_DRS_PER_SYNC |
+                                  DRSUAPI_DRS_GET_ANC |
+                                  DRSUAPI_DRS_NEVER_SYNCED;
 
         ZERO_STRUCT(null_sid);
@@ -416 +426 @@
 static NTSTATUS libnet_dssync_getncchanges(TALLOC_CTX *mem_ctx,
                                            struct dssync_context *ctx,
-                                           int32_t level,
+                                           uint32_t level,
                                            union drsuapi_DsGetNCChangesRequest *req,
                                            struct replUpToDateVectorBlob **pnew_utdv)
@@ -426 +436 @@
         struct drsuapi_DsGetNCChangesCtr6 *ctr6 = NULL;
         struct replUpToDateVectorBlob *new_utdv = NULL;
-        int32_t level_out = 0;
-        int32_t out_level = 0;
+        uint32_t level_out = 0;
+        uint32_t out_level = 0;
         int y;
         bool last_query;
+        struct dcerpc_binding_handle *b = ctx->cli->binding_handle;
 
         if (!ctx->single_object_replication) {
@@ -442 +453 @@
                 struct drsuapi_DsReplicaObjectListItemEx *first_object = NULL;
                 struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr = NULL;
+                uint32_t linked_attributes_count = 0;
+                struct drsuapi_DsReplicaLinkedAttribute *linked_attributes = NULL;
 
                 if (level == 8) {
@@ -453 +466 @@
                 }
 
-                status = rpccli_drsuapi_DsGetNCChanges(ctx->cli, mem_ctx,
+                status = dcerpc_drsuapi_DsGetNCChanges(b, mem_ctx,
                                                        &ctx->bind_handle,
                                                        level,
@@ -463 +476 @@
                         ctx->error_message = talloc_asprintf(ctx,
                                 "Failed to get NC Changes: %s",
-                                get_friendly_werror_msg(werr));
+                                get_friendly_nt_error_msg(status));
                         goto out;
                 }
@@ -469 +482 @@
                 if (!W_ERROR_IS_OK(werr)) {
                         status = werror_to_ntstatus(werr);
+                        ctx->error_message = talloc_asprintf(ctx,
+                                "Failed to get NC Changes: %s",
+                                get_friendly_werror_msg(werr));
                         goto out;
                 }
@@ -525 +541 @@
                         mapping_ctr = &ctr6->mapping_ctr;
 
+                        linked_attributes = ctr6->linked_attributes;
+                        linked_attributes_count = ctr6->linked_attributes_count;
+
                         if (ctr6->more_data) {
                                 req->req8.highwatermark = ctr6->new_highwatermark;
@@ -564 +583 @@
                         }
                 }
+
+                if (linked_attributes_count == 0) {
+                        continue;
+                }
+
+                if (ctx->ops->process_links) {
+                        status = ctx->ops->process_links(ctx, mem_ctx,
+                                                         linked_attributes_count,
+                                                         linked_attributes,
+                                                         mapping_ctr);
+                        if (!NT_STATUS_IS_OK(status)) {
+                                ctx->error_message = talloc_asprintf(ctx,
+                                        "Failed to call processing function: %s",
+                                        nt_errstr(status));
+                                goto out;
+                        }
+                }
         }
 
@@ -577 +613 @@
         NTSTATUS status;
 
-        int32_t level = 0;
+        uint32_t level = 0;
         union drsuapi_DsGetNCChangesRequest req;
         struct replUpToDateVectorBlob *old_utdv = NULL;

vendor/current/source3/libnet/libnet_dssync.h

@@ -19 +19 @@
  */
 
+#include "../librpc/gen_ndr/drsuapi.h"
+#include "../librpc/gen_ndr/drsblobs.h"
+
 struct dssync_context;
 
@@ -28 +31 @@
                                     struct drsuapi_DsReplicaObjectListItemEx *objects,
                                     struct drsuapi_DsReplicaOIDMapping_Ctr *mappings);
+        NTSTATUS (*process_links)(struct dssync_context *ctx,
+                                  TALLOC_CTX *mem_ctx,
+                                  uint32_t count,
+                                  struct drsuapi_DsReplicaLinkedAttribute *links,
+                                  struct drsuapi_DsReplicaOIDMapping_Ctr *mappings);
         NTSTATUS (*finish)(struct dssync_context *ctx, TALLOC_CTX *mem_ctx,
                            struct replUpToDateVectorBlob *new_utdv);
@@ -56 +64 @@
 
 extern const struct dssync_ops libnet_dssync_keytab_ops;
+extern const struct dssync_ops libnet_dssync_passdb_ops;
+
+/* The following definitions come from libnet/libnet_dssync.c  */
+
+NTSTATUS libnet_dssync_init_context(TALLOC_CTX *mem_ctx,
+                                    struct dssync_context **ctx_p);
+NTSTATUS libnet_dssync(TALLOC_CTX *mem_ctx,
+                       struct dssync_context *ctx);

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_ATTID_servicePrincipalName) {
                         uint32_t count;
                         num_spns = attr->value_ctr.num_values;
@@ -296 +298 @@
 
                 switch (attr->attid) {
-                        case DRSUAPI_ATTRIBUTE_unicodePwd:
+                        case DRSUAPI_ATTID_unicodePwd:
 
                                 if (blob->length != 16) {
@@ -317 +319 @@
                                 kvno = cur->meta_data_ctr->meta_data[i].version;
                                 break;
-                        case DRSUAPI_ATTRIBUTE_ntPwdHistory:
+                        case DRSUAPI_ATTID_ntPwdHistory:
                                 pwd_history_len = blob->length / 16;
                                 pwd_history = blob->data;
                                 break;
-                        case DRSUAPI_ATTRIBUTE_userPrincipalName:
+                        case DRSUAPI_ATTID_userPrincipalName:
                                 pull_string_talloc(mem_ctx, NULL, 0, &upn,
                                                    blob->data, blob->length,
                                                    STR_UNICODE);
                                 break;
-                        case DRSUAPI_ATTRIBUTE_sAMAccountName:
+                        case DRSUAPI_ATTID_sAMAccountName:
                                 pull_string_talloc(mem_ctx, NULL, 0, &name,
                                                    blob->data, blob->length,
                                                    STR_UNICODE);
                                 break;
-                        case DRSUAPI_ATTRIBUTE_sAMAccountType:
+                        case DRSUAPI_ATTID_sAMAccountType:
                                 sam_type = IVAL(blob->data, 0);
                                 break;
-                        case DRSUAPI_ATTRIBUTE_userAccountControl:
+                        case DRSUAPI_ATTID_userAccountControl:
                                 uacc = IVAL(blob->data, 0);
                                 break;
-                        case DRSUAPI_ATTRIBUTE_supplementalCredentials:
+                        case DRSUAPI_ATTID_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 = {

vendor/current/source3/libnet/libnet_join.c

@@ -20 +20 @@
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "ads.h"
+#include "librpc/gen_ndr/ndr_libnet_join.h"
+#include "libnet/libnet_join.h"
 #include "libcli/auth/libcli_auth.h"
-#include "../librpc/gen_ndr/cli_samr.h"
-#include "../librpc/gen_ndr/cli_lsa.h"
+#include "../librpc/gen_ndr/ndr_samr_c.h"
+#include "rpc_client/init_samr.h"
+#include "../librpc/gen_ndr/ndr_lsa_c.h"
+#include "rpc_client/cli_lsarpc.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "rpc_client/cli_netlogon.h"
+#include "lib/smbconf/smbconf.h"
+#include "lib/smbconf/smbconf_reg.h"
+#include "../libds/common/flags.h"
+#include "secrets.h"
+#include "rpc_client/init_lsa.h"
+#include "rpc_client/cli_pipe.h"
+#include "krb5_env.h"
+#include "../libcli/security/security.h"
+#include "passdb.h"
+#include "libsmb/libsmb.h"
 
 /****************************************************************
@@ -90 +106 @@
 }
 
-#ifdef WITH_ADS
+#ifdef HAVE_ADS
 
 /****************************************************************
@@ -630 +646 @@
         return ADS_SUCCESS;
 }
-#endif /* WITH_ADS */
+#endif /* HAVE_ADS */
 
 /****************************************************************
@@ -685 +701 @@
                                    pass,
                                    flags,
-                                   Undefined, NULL);
+                                   Undefined);
 }
 
@@ -698 +714 @@
         struct rpc_pipe_client *pipe_hnd = NULL;
         struct policy_handle lsa_pol;
-        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+        NTSTATUS status, result;
         union lsa_PolicyInformation *info = NULL;
+        struct dcerpc_binding_handle *b;
 
         status = libnet_join_connect_dc_ipc(r->in.dc_name,
@@ -718 +735 @@
         }
 
+        b = pipe_hnd->binding_handle;
+
         status = rpccli_lsa_open_policy(pipe_hnd, mem_ctx, true,
                                         SEC_FLAG_MAXIMUM_ALLOWED, &lsa_pol);
@@ -724 +743 @@
         }
 
-        status = rpccli_lsa_QueryInfoPolicy2(pipe_hnd, mem_ctx,
+        status = dcerpc_lsa_QueryInfoPolicy2(b, mem_ctx,
                                              &lsa_pol,
                                              LSA_POLICY_INFO_DNS,
-                                             &info);
-        if (NT_STATUS_IS_OK(status)) {
+                                             &info,
+                                             &result);
+        if (NT_STATUS_IS_OK(status) && NT_STATUS_IS_OK(result)) {
                 r->out.domain_is_ad = true;
                 r->out.netbios_domain_name = info->dns.name.string;
                 r->out.dns_domain_name = info->dns.dns_domain.string;
                 r->out.forest_name = info->dns.dns_forest.string;
-                r->out.domain_sid = sid_dup_talloc(mem_ctx, info->dns.sid);
+                r->out.domain_sid = dom_sid_dup(mem_ctx, info->dns.sid);
                 NT_STATUS_HAVE_NO_MEMORY(r->out.domain_sid);
         }
 
         if (!NT_STATUS_IS_OK(status)) {
-                status = rpccli_lsa_QueryInfoPolicy(pipe_hnd, mem_ctx,
+                status = dcerpc_lsa_QueryInfoPolicy(b, mem_ctx,
                                                     &lsa_pol,
                                                     LSA_POLICY_INFO_ACCOUNT_DOMAIN,
-                                                    &info);
+                                                    &info,
+                                                    &result);
                 if (!NT_STATUS_IS_OK(status)) {
                         goto done;
                 }
+                if (!NT_STATUS_IS_OK(result)) {
+                        status = result;
+                        goto done;
+                }
 
                 r->out.netbios_domain_name = info->account_domain.name.string;
-                r->out.domain_sid = sid_dup_talloc(mem_ctx, info->account_domain.sid);
+                r->out.domain_sid = dom_sid_dup(mem_ctx, info->account_domain.sid);
                 NT_STATUS_HAVE_NO_MEMORY(r->out.domain_sid);
         }
 
-        rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol);
+        dcerpc_lsa_Close(b, mem_ctx, &lsa_pol, &result);
         TALLOC_FREE(pipe_hnd);
 
@@ -818 +843 @@
         struct rpc_pipe_client *pipe_hnd = NULL;
         struct policy_handle sam_pol, domain_pol, user_pol;
-        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+        NTSTATUS status = NT_STATUS_UNSUCCESSFUL, result;
         char *acct_name;
         struct lsa_String lsa_acct_name;
@@ -826 +851 @@
         struct samr_Ids name_types;
         union samr_UserInfo user_info;
+        struct dcerpc_binding_handle *b = NULL;
 
         struct samr_CryptPassword crypt_pwd;
@@ -860 +886 @@
         }
 
-        status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+        b = pipe_hnd->binding_handle;
+
+        status = dcerpc_samr_Connect2(b, mem_ctx,
                                       pipe_hnd->desthost,
                                       SAMR_ACCESS_ENUM_DOMAINS
                                       | SAMR_ACCESS_LOOKUP_DOMAIN,
-                                      &sam_pol);
-        if (!NT_STATUS_IS_OK(status)) {
-                goto done;
-        }
-
-        status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                      &sam_pol,
+                                      &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                goto done;
+        }
+        if (!NT_STATUS_IS_OK(result)) {
+                status = result;
+                goto done;
+        }
+
+        status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                         &sam_pol,
                                         SAMR_DOMAIN_ACCESS_LOOKUP_INFO_1
@@ -875 +908 @@
                                         | SAMR_DOMAIN_ACCESS_OPEN_ACCOUNT,
                                         r->out.domain_sid,
-                                        &domain_pol);
-        if (!NT_STATUS_IS_OK(status)) {
+                                        &domain_pol,
+                                        &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                goto done;
+        }
+        if (!NT_STATUS_IS_OK(result)) {
+                status = result;
                 goto done;
         }
@@ -899 +937 @@
                         access_desired));
 
-                status = rpccli_samr_CreateUser2(pipe_hnd, mem_ctx,
+                status = dcerpc_samr_CreateUser2(b, mem_ctx,
                                                  &domain_pol,
                                                  &lsa_acct_name,
@@ -906 +944 @@
                                                  &user_pol,
                                                  &access_granted,
-                                                 &user_rid);
+                                                 &user_rid,
+                                                 &result);
+                if (!NT_STATUS_IS_OK(status)) {
+                        goto done;
+                }
+
+                status = result;
                 if (!NT_STATUS_IS_OK(status) &&
                     !NT_STATUS_EQUAL(status, NT_STATUS_USER_EXISTS)) {
@@ -936 +980 @@
 
                 if (NT_STATUS_IS_OK(status)) {
-                        rpccli_samr_Close(pipe_hnd, mem_ctx, &user_pol);
-                }
-        }
-
-        status = rpccli_samr_LookupNames(pipe_hnd, mem_ctx,
+                        dcerpc_samr_Close(b, mem_ctx, &user_pol, &result);
+                }
+        }
+
+        status = dcerpc_samr_LookupNames(b, mem_ctx,
                                          &domain_pol,
                                          1,
                                          &lsa_acct_name,
                                          &user_rids,
-                                         &name_types);
-        if (!NT_STATUS_IS_OK(status)) {
+                                         &name_types,
+                                         &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                goto done;
+        }
+        if (!NT_STATUS_IS_OK(result)) {
+                status = result;
                 goto done;
         }
@@ -961 +1010 @@
         /* Open handle on user */
 
-        status = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+        status = dcerpc_samr_OpenUser(b, mem_ctx,
                                       &domain_pol,
                                       SEC_FLAG_MAXIMUM_ALLOWED,
                                       user_rid,
-                                      &user_pol);
-        if (!NT_STATUS_IS_OK(status)) {
+                                      &user_pol,
+                                      &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                goto done;
+        }
+        if (!NT_STATUS_IS_OK(result)) {
+                status = result;
                 goto done;
         }
@@ -973 +1027 @@
 
         acct_flags |= ACB_PWNOEXP;
-        if (r->out.domain_is_ad) {
-#if !defined(ENCTYPE_ARCFOUR_HMAC)
-                acct_flags |= ACB_USE_DES_KEY_ONLY;
-#endif
-                ;;
-        }
 
         /* Set account flags on machine account */
@@ -984 +1032 @@
         user_info.info16.acct_flags = acct_flags;
 
-        status = rpccli_samr_SetUserInfo(pipe_hnd, mem_ctx,
+        status = dcerpc_samr_SetUserInfo(b, mem_ctx,
                                          &user_pol,
                                          16,
-                                         &user_info);
-
-        if (!NT_STATUS_IS_OK(status)) {
-
-                rpccli_samr_DeleteUser(pipe_hnd, mem_ctx,
-                                       &user_pol);
+                                         &user_info,
+                                         &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                dcerpc_samr_DeleteUser(b, mem_ctx,
+                                       &user_pol,
+                                       &result);
 
                 libnet_join_set_error_string(mem_ctx, r,
@@ -1000 +1048 @@
         }
 
+        if (!NT_STATUS_IS_OK(result)) {
+                status = result;
+
+                dcerpc_samr_DeleteUser(b, mem_ctx,
+                                       &user_pol,
+                                       &result);
+
+                libnet_join_set_error_string(mem_ctx, r,
+                        "Failed to set account flags for machine account (%s)\n",
+                        nt_errstr(status));
+                goto done;
+        }
+
         /* Set password on machine account - first try level 26 */
 
@@ -1009 +1070 @@
         user_info.info26.password_expired = PASS_DONT_CHANGE_AT_NEXT_LOGON;
 
-        status = rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,
+        status = dcerpc_samr_SetUserInfo2(b, mem_ctx,
                                           &user_pol,
                                           26,
-                                          &user_info);
-
-        if (NT_STATUS_EQUAL(status, NT_STATUS(DCERPC_FAULT_INVALID_TAG))) {
+                                          &user_info,
+                                          &result);
+
+        if (NT_STATUS_EQUAL(status, NT_STATUS_RPC_ENUM_VALUE_OUT_OF_RANGE)) {
 
                 /* retry with level 24 */
@@ -1025 +1087 @@
                 user_info.info24.password_expired = PASS_DONT_CHANGE_AT_NEXT_LOGON;
 
-                status = rpccli_samr_SetUserInfo2(pipe_hnd, mem_ctx,
+                status = dcerpc_samr_SetUserInfo2(b, mem_ctx,
                                                   &user_pol,
                                                   24,
-                                                  &user_info);
-        }
-
-        if (!NT_STATUS_IS_OK(status)) {
-
-                rpccli_samr_DeleteUser(pipe_hnd, mem_ctx,
-                                       &user_pol);
+                                                  &user_info,
+                                                  &result);
+        }
+
+        if (!NT_STATUS_IS_OK(status)) {
+
+                dcerpc_samr_DeleteUser(b, mem_ctx,
+                                       &user_pol,
+                                       &result);
 
                 libnet_join_set_error_string(mem_ctx, r,
@@ -1041 +1105 @@
                 goto done;
         }
+        if (!NT_STATUS_IS_OK(result)) {
+                status = result;
+
+                dcerpc_samr_DeleteUser(b, mem_ctx,
+                                       &user_pol,
+                                       &result);
+
+                libnet_join_set_error_string(mem_ctx, r,
+                        "Failed to set password for machine account (%s)\n",
+                        nt_errstr(status));
+                goto done;
+        }
 
         status = NT_STATUS_OK;
@@ -1050 +1126 @@
 
         if (is_valid_policy_hnd(&sam_pol)) {
-                rpccli_samr_Close(pipe_hnd, mem_ctx, &sam_pol);
+                dcerpc_samr_Close(b, mem_ctx, &sam_pol, &result);
         }
         if (is_valid_policy_hnd(&domain_pol)) {
-                rpccli_samr_Close(pipe_hnd, mem_ctx, &domain_pol);
+                dcerpc_samr_Close(b, mem_ctx, &domain_pol, &result);
         }
         if (is_valid_policy_hnd(&user_pol)) {
-                rpccli_samr_Close(pipe_hnd, mem_ctx, &user_pol);
+                dcerpc_samr_Close(b, mem_ctx, &user_pol, &result);
         }
         TALLOC_FREE(pipe_hnd);
@@ -1105 +1181 @@
                                      machine_password,
                                      0,
-                                     Undefined, NULL);
+                                     Undefined);
         free(machine_account);
         free(machine_password);
@@ -1118 +1194 @@
                                              "",
                                              0,
-                                             Undefined, NULL);
+                                             Undefined);
         }
 
@@ -1210 +1286 @@
         struct rpc_pipe_client *pipe_hnd = NULL;
         struct policy_handle sam_pol, domain_pol, user_pol;
-        NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
+        NTSTATUS status = NT_STATUS_UNSUCCESSFUL, result;
         char *acct_name;
         uint32_t user_rid;
@@ -1217 +1293 @@
         struct samr_Ids name_types;
         union samr_UserInfo *info = NULL;
+        struct dcerpc_binding_handle *b = NULL;
 
         ZERO_STRUCT(sam_pol);
@@ -1241 +1318 @@
         }
 
-        status = rpccli_samr_Connect2(pipe_hnd, mem_ctx,
+        b = pipe_hnd->binding_handle;
+
+        status = dcerpc_samr_Connect2(b, mem_ctx,
                                       pipe_hnd->desthost,
                                       SEC_FLAG_MAXIMUM_ALLOWED,
-                                      &sam_pol);
-        if (!NT_STATUS_IS_OK(status)) {
-                goto done;
-        }
-
-        status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                      &sam_pol,
+                                      &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                goto done;
+        }
+        if (!NT_STATUS_IS_OK(result)) {
+                status = result;
+                goto done;
+        }
+
+        status = dcerpc_samr_OpenDomain(b, mem_ctx,
                                         &sam_pol,
                                         SEC_FLAG_MAXIMUM_ALLOWED,
                                         r->in.domain_sid,
-                                        &domain_pol);
-        if (!NT_STATUS_IS_OK(status)) {
+                                        &domain_pol,
+                                        &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                goto done;
+        }
+        if (!NT_STATUS_IS_OK(result)) {
+                status = result;
                 goto done;
         }
@@ -1265 +1354 @@
         init_lsa_String(&lsa_acct_name, acct_name);
 
-        status = rpccli_samr_LookupNames(pipe_hnd, mem_ctx,
+        status = dcerpc_samr_LookupNames(b, mem_ctx,
                                          &domain_pol,
                                          1,
                                          &lsa_acct_name,
                                          &user_rids,
-                                         &name_types);
-
-        if (!NT_STATUS_IS_OK(status)) {
+                                         &name_types,
+                                         &result);
+
+        if (!NT_STATUS_IS_OK(status)) {
+                goto done;
+        }
+        if (!NT_STATUS_IS_OK(result)) {
+                status = result;
                 goto done;
         }
@@ -1287 +1381 @@
         /* Open handle on user */
 
-        status = rpccli_samr_OpenUser(pipe_hnd, mem_ctx,
+        status = dcerpc_samr_OpenUser(b, mem_ctx,
                                       &domain_pol,
                                       SEC_FLAG_MAXIMUM_ALLOWED,
                                       user_rid,
-                                      &user_pol);
-        if (!NT_STATUS_IS_OK(status)) {
+                                      &user_pol,
+                                      &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                goto done;
+        }
+        if (!NT_STATUS_IS_OK(result)) {
+                status = result;
                 goto done;
         }
@@ -1298 +1397 @@
         /* Get user info */
 
-        status = rpccli_samr_QueryUserInfo(pipe_hnd, mem_ctx,
+        status = dcerpc_samr_QueryUserInfo(b, mem_ctx,
                                            &user_pol,
                                            16,
-                                           &info);
-        if (!NT_STATUS_IS_OK(status)) {
-                rpccli_samr_Close(pipe_hnd, mem_ctx, &user_pol);
+                                           &info,
+                                           &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                dcerpc_samr_Close(b, mem_ctx, &user_pol, &result);
+                goto done;
+        }
+        if (!NT_STATUS_IS_OK(result)) {
+                status = result;
+                dcerpc_samr_Close(b, mem_ctx, &user_pol, &result);
                 goto done;
         }
@@ -1311 +1416 @@
         info->info16.acct_flags |= ACB_DISABLED;
 
-        status = rpccli_samr_SetUserInfo(pipe_hnd, mem_ctx,
+        status = dcerpc_samr_SetUserInfo(b, mem_ctx,
                                          &user_pol,
                                          16,
-                                         info);
-
-        rpccli_samr_Close(pipe_hnd, mem_ctx, &user_pol);
+                                         info,
+                                         &result);
+        if (!NT_STATUS_IS_OK(status)) {
+                dcerpc_samr_Close(b, mem_ctx, &user_pol, &result);
+                goto done;
+        }
+        if (!NT_STATUS_IS_OK(result)) {
+                status = result;
+                dcerpc_samr_Close(b, mem_ctx, &user_pol, &result);
+                goto done;
+        }
+        status = result;
+        dcerpc_samr_Close(b, mem_ctx, &user_pol, &result);
 
 done:
-        if (pipe_hnd) {
+        if (pipe_hnd && b) {
                 if (is_valid_policy_hnd(&domain_pol)) {
-                        rpccli_samr_Close(pipe_hnd, mem_ctx, &domain_pol);
+                        dcerpc_samr_Close(b, mem_ctx, &domain_pol, &result);
                 }
                 if (is_valid_policy_hnd(&sam_pol)) {
-                        rpccli_samr_Close(pipe_hnd, mem_ctx, &sam_pol);
+                        dcerpc_samr_Close(b, mem_ctx, &sam_pol, &result);
                 }
                 TALLOC_FREE(pipe_hnd);
@@ -1341 +1456 @@
 static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r)
 {
-        WERROR werr;
+        WERROR werr = WERR_OK;
+        sbcErr err;
         struct smbconf_ctx *ctx;
 
-        werr = smbconf_init_reg(r, &ctx, NULL);
-        if (!W_ERROR_IS_OK(werr)) {
+        err = smbconf_init_reg(r, &ctx, NULL);
+        if (!SBC_ERROR_IS_OK(err)) {
+                werr = WERR_NO_SUCH_SERVICE;
                 goto done;
         }
@@ -1351 +1468 @@
         if (!(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE)) {
 
-                werr = smbconf_set_global_parameter(ctx, "security", "user");
-                W_ERROR_NOT_OK_GOTO_DONE(werr);
-
-                werr = smbconf_set_global_parameter(ctx, "workgroup",
-                                                    r->in.domain_name);
+                err = smbconf_set_global_parameter(ctx, "security", "user");
+                if (!SBC_ERROR_IS_OK(err)) {
+                        werr = WERR_NO_SUCH_SERVICE;
+                        goto done;
+                }
+
+                err = smbconf_set_global_parameter(ctx, "workgroup",
+                                                   r->in.domain_name);
+                if (!SBC_ERROR_IS_OK(err)) {
+                        werr = WERR_NO_SUCH_SERVICE;
+                        goto done;
+                }
 
                 smbconf_delete_global_parameter(ctx, "realm");
@@ -1361 +1485 @@
         }
 
-        werr = smbconf_set_global_parameter(ctx, "security", "domain");
-        W_ERROR_NOT_OK_GOTO_DONE(werr);
-
-        werr = smbconf_set_global_parameter(ctx, "workgroup",
-                                            r->out.netbios_domain_name);
-        W_ERROR_NOT_OK_GOTO_DONE(werr);
+        err = smbconf_set_global_parameter(ctx, "security", "domain");
+        if (!SBC_ERROR_IS_OK(err)) {
+                werr = WERR_NO_SUCH_SERVICE;
+                goto done;
+        }
+
+        err = smbconf_set_global_parameter(ctx, "workgroup",
+                                           r->out.netbios_domain_name);
+        if (!SBC_ERROR_IS_OK(err)) {
+                werr = WERR_NO_SUCH_SERVICE;
+                goto done;
+        }
 
         if (r->out.domain_is_ad) {
-                werr = smbconf_set_global_parameter(ctx, "security", "ads");
-                W_ERROR_NOT_OK_GOTO_DONE(werr);
-
-                werr = smbconf_set_global_parameter(ctx, "realm",
-                                                    r->out.dns_domain_name);
-                W_ERROR_NOT_OK_GOTO_DONE(werr);
+                err = smbconf_set_global_parameter(ctx, "security", "ads");
+                if (!SBC_ERROR_IS_OK(err)) {
+                        werr = WERR_NO_SUCH_SERVICE;
+                        goto done;
+                }
+
+                err = smbconf_set_global_parameter(ctx, "realm",
+                                                   r->out.dns_domain_name);
+                if (!SBC_ERROR_IS_OK(err)) {
+                        werr = WERR_NO_SUCH_SERVICE;
+                        goto done;
+                }
         }
 
@@ -1388 +1524 @@
 {
         WERROR werr = WERR_OK;
+        sbcErr err;
         struct smbconf_ctx *ctx;
 
-        werr = smbconf_init_reg(r, &ctx, NULL);
-        if (!W_ERROR_IS_OK(werr)) {
+        err = smbconf_init_reg(r, &ctx, NULL);
+        if (!SBC_ERROR_IS_OK(err)) {
+                werr = WERR_NO_SUCH_SERVICE;
                 goto done;
         }
@@ -1397 +1535 @@
         if (r->in.unjoin_flags & WKSSVC_JOIN_FLAGS_JOIN_TYPE) {
 
-                werr = smbconf_set_global_parameter(ctx, "security", "user");
-                W_ERROR_NOT_OK_GOTO_DONE(werr);
-
-                werr = smbconf_delete_global_parameter(ctx, "workgroup");
-                W_ERROR_NOT_OK_GOTO_DONE(werr);
+                err = smbconf_set_global_parameter(ctx, "security", "user");
+                if (!SBC_ERROR_IS_OK(err)) {
+                        werr = WERR_NO_SUCH_SERVICE;
+                        goto done;
+                }
+
+                err = smbconf_delete_global_parameter(ctx, "workgroup");
+                if (!SBC_ERROR_IS_OK(err)) {
+                        werr = WERR_NO_SUCH_SERVICE;
+                        goto done;
+                }
 
                 smbconf_delete_global_parameter(ctx, "realm");
@@ -1599 +1743 @@
         }
 
-#ifdef WITH_ADS
+#ifdef HAVE_ADS
         if (r->out.domain_is_ad &&
             !(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_UNSECURE)) {
@@ -1609 +1753 @@
                 }
         }
-#endif /* WITH_ADS */
+#endif /* HAVE_ADS */
 
         libnet_join_add_dom_rids_to_builtins(r->out.domain_sid);
@@ -1817 +1961 @@
         WERROR werr;
         struct cli_state *cli = NULL;
-#ifdef WITH_ADS
+#ifdef HAVE_ADS
         ADS_STATUS ads_status;
-#endif /* WITH_ADS */
+#endif /* HAVE_ADS */
 
         if (!r->in.dc_name) {
@@ -1860 +2004 @@
         }
 
-#ifdef WITH_ADS
+#ifdef HAVE_ADS
+
+        create_local_private_krb5_conf_for_domain(
+                r->out.dns_domain_name, r->out.netbios_domain_name,
+                NULL, &cli->dest_ss, cli->desthost);
+
         if (r->out.domain_is_ad && r->in.account_ou &&
             !(r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_UNSECURE)) {
@@ -1880 +2029 @@
                 r->in.join_flags &= ~WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE;
         }
-#endif /* WITH_ADS */
+#endif /* HAVE_ADS */
 
         if ((r->in.join_flags & WKSSVC_JOIN_FLAGS_JOIN_UNSECURE) &&
@@ -1955 +2104 @@
         }
 
+        ZERO_STRUCT(r->out);
+
         werr = libnet_join_pre_processing(mem_ctx, r);
         if (!W_ERROR_IS_OK(werr)) {
@@ -2003 +2154 @@
                         return WERR_SETUP_NOT_JOINED;
                 }
-                r->in.domain_sid = sid_dup_talloc(mem_ctx, &sid);
+                r->in.domain_sid = dom_sid_dup(mem_ctx, &sid);
                 W_ERROR_HAVE_NO_MEMORY(r->in.domain_sid);
         }
@@ -2038 +2189 @@
         }
 
-#ifdef WITH_ADS
+#ifdef HAVE_ADS
         /* for net ads leave, try to delete the account.  If it works, 
            no sense in disabling.  If it fails, we can still try to 
            disable it. jmcd */
-           
+
         if (r->in.delete_machine_account) {
                 ADS_STATUS ads_status;
@@ -2065 +2216 @@
                 }
         }
-#endif /* WITH_ADS */
+#endif /* HAVE_ADS */
 
         /* The WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE flag really means 
@@ -2080 +2231 @@
                         return ntstatus_to_werror(status);
                 }
-                
+
                 r->out.disabled_machine_account = true;
         }

vendor/current/source3/libnet/libnet_keytab.c

@@ -21 +21 @@
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "smb_krb5.h"
+#include "ads.h"
+#include "libnet/libnet_keytab.h"
 
 #ifdef HAVE_KRB5

vendor/current/source3/libnet/libnet_keytab.h

@@ -40 +40 @@
 };
 
+/* The following definitions come from libnet/libnet_keytab.c  */
+
+krb5_error_code libnet_keytab_init(TALLOC_CTX *mem_ctx,
+                                   const char *keytab_name,
+                                   struct libnet_keytab_context **ctx);
+krb5_error_code libnet_keytab_add(struct libnet_keytab_context *ctx);
+
+struct libnet_keytab_entry *libnet_keytab_search(struct libnet_keytab_context *ctx,
+                                                 const char *principal, int kvno,
+                                                 const krb5_enctype enctype,
+                                                 TALLOC_CTX *mem_ctx);
+NTSTATUS libnet_keytab_add_to_keytab_entries(TALLOC_CTX *mem_ctx,
+                                             struct libnet_keytab_context *ctx,
+                                             uint32_t kvno,
+                                             const char *name,
+                                             const char *prefix,
+                                             const krb5_enctype enctype,
+                                             DATA_BLOB blob);
 #endif /* HAVE_KRB5 */

vendor/current/source3/libnet/libnet_samsync.c

@@ -23 +23 @@
 
 #include "includes.h"
-#include "libnet/libnet.h"
-#include "../lib/crypto/crypto.h"
+#include "libnet/libnet_samsync.h"
 #include "../libcli/samsync/samsync.h"
 #include "../libcli/auth/libcli_auth.h"
-#include "../librpc/gen_ndr/cli_netlogon.h"
+#include "rpc_client/rpc_client.h"
+#include "../librpc/gen_ndr/ndr_netlogon.h"
+#include "../librpc/gen_ndr/ndr_netlogon_c.h"
+#include "../libcli/security/security.h"
+#include "messages.h"
 
 /**
@@ -72 +75 @@
 
         if (domain_sid) {
-                ctx->domain_sid = sid_dup_talloc(mem_ctx, domain_sid);
+                ctx->domain_sid = dom_sid_dup(mem_ctx, domain_sid);
                 NT_STATUS_HAVE_NO_MEMORY(ctx->domain_sid);
 
@@ -78 +81 @@
                 NT_STATUS_HAVE_NO_MEMORY(ctx->domain_sid_str);
         }
+
+        ctx->msg_ctx = messaging_init(ctx, procid_self(),
+                                      event_context_init(ctx));
+        NT_STATUS_HAVE_NO_MEMORY(ctx->msg_ctx);
 
         *ctx_p = ctx;
@@ -194 +201 @@
                                      struct netr_ChangeLogEntry *e)
 {
-        NTSTATUS result;
+        NTSTATUS result, status;
         NTSTATUS callback_status;
         const char *logon_server = ctx->cli->desthost;
@@ -202 +209 @@
         uint16_t restart_state = 0;
         uint32_t sync_context = 0;
+        struct dcerpc_binding_handle *b = ctx->cli->binding_handle;
 
         ZERO_STRUCT(return_authenticator);
@@ -212 +220 @@
                 if (ctx->single_object_replication &&
                     !ctx->force_full_replication) {
-                        result = rpccli_netr_DatabaseRedo(ctx->cli, mem_ctx,
+                        status = dcerpc_netr_DatabaseRedo(b, mem_ctx,
                                                           logon_server,
                                                           computername,
@@ -219 +227 @@
                                                           *e,
                                                           0,
-                                                          &delta_enum_array);
+                                                          &delta_enum_array,
+                                                          &result);
                 } else if (!ctx->force_full_replication &&
                            sequence_num && (*sequence_num > 0)) {
-                        result = rpccli_netr_DatabaseDeltas(ctx->cli, mem_ctx,
+                        status = dcerpc_netr_DatabaseDeltas(b, mem_ctx,
                                                             logon_server,
                                                             computername,
@@ -230 +239 @@
                                                             sequence_num,
                                                             &delta_enum_array,
-                                                            0xffff);
+                                                            0xffff,
+                                                            &result);
                 } else {
-                        result = rpccli_netr_DatabaseSync2(ctx->cli, mem_ctx,
+                        status = dcerpc_netr_DatabaseSync2(b, mem_ctx,
                                                            logon_server,
                                                            computername,
@@ -241 +251 @@
                                                            &sync_context,
                                                            &delta_enum_array,
-                                                           0xffff);
-                }
-
-                if (NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED)) {
-                        return result;
+                                                           0xffff,
+                                                           &result);
+                }
+
+                if (!NT_STATUS_IS_OK(status)) {
+                        return status;
                 }
 
@@ -253 +264 @@
                         DEBUG(0,("credentials chain check failed\n"));
                         return NT_STATUS_ACCESS_DENIED;
+                }
+
+                if (NT_STATUS_EQUAL(result, NT_STATUS_NOT_SUPPORTED)) {
+                        return result;
                 }
 
@@ -397 +412 @@
         blob = data_blob_const(r->array, r->length);
 
-        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, NULL, str,
+        ndr_err = ndr_pull_struct_blob(&blob, mem_ctx, str,
                        (ndr_pull_flags_fn_t)ndr_pull_netr_AcctLockStr);
 

vendor/current/source3/libnet/libnet_samsync.h

@@ -18 +18 @@
  */
 
+#include "../librpc/gen_ndr/netlogon.h"
 
 enum net_samsync_mode {
@@ -75 +76 @@
 
         struct rpc_pipe_client *cli;
+        struct messaging_context *msg_ctx;
 
         const struct samsync_ops *ops;
@@ -85 +87 @@
 extern const struct samsync_ops libnet_samsync_display_ops;
 extern const struct samsync_ops libnet_samsync_passdb_ops;
+
+/* The following definitions come from libnet/libnet_samsync.c  */
+
+NTSTATUS libnet_samsync_init_context(TALLOC_CTX *mem_ctx,
+                                     const struct dom_sid *domain_sid,
+                                     struct samsync_context **ctx_p);
+NTSTATUS libnet_samsync(enum netr_SamDatabaseID database_id,
+                        struct samsync_context *ctx);
+NTSTATUS pull_netr_AcctLockStr(TALLOC_CTX *mem_ctx,
+                               struct lsa_BinaryString *r,
+                               struct netr_AcctLockStr **str_p);

vendor/current/source3/libnet/libnet_samsync_display.c

@@ -25 +25 @@
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "libnet/libnet_samsync.h"
+#include "passdb.h"
 
 static void display_group_mem_info(uint32_t rid,
@@ -207 +208 @@
                 break;
         case NETR_DELTA_POLICY:
-                printf("Policy\n");
+                printf("Policy: %s\n",
+                        sid_string_dbg(id.sid));
                 break;
         case NETR_DELTA_TRUSTED_DOMAIN:
@@ -214 +216 @@
                 break;
         case NETR_DELTA_DELETE_TRUST:
-                printf("Delete Trust: %d\n",
-                        u.delete_trust.unknown);
+                printf("Delete Trust: %s\n",
+                        sid_string_dbg(id.sid));
                 break;
         case NETR_DELTA_ACCOUNT:
-                printf("Account\n");
+                printf("Account: %s\n",
+                        sid_string_dbg(id.sid));
                 break;
         case NETR_DELTA_DELETE_ACCOUNT:
-                printf("Delete Account: %d\n",
-                        u.delete_account.unknown);
+                printf("Delete Account: %s\n",
+                        sid_string_dbg(id.sid));
                 break;
         case NETR_DELTA_SECRET:
-                printf("Secret\n");
+                printf("Secret: %s\n",
+                        id.name);
                 break;
         case NETR_DELTA_DELETE_SECRET:
-                printf("Delete Secret: %d\n",
-                        u.delete_secret.unknown);
+                printf("Delete Secret: %s\n",
+                        id.name);
                 break;
         case NETR_DELTA_DELETE_GROUP2:

vendor/current/source3/libnet/libnet_samsync_keytab.c

@@ -20 +20 @@
 
 #include "includes.h"
-#include "libnet/libnet.h"
-
-#if defined(HAVE_ADS) && defined(ENCTYPE_ARCFOUR_HMAC)
+#include "smb_krb5.h"
+#include "ads.h"
+#include "libnet/libnet_keytab.h"
+#include "libnet/libnet_samsync.h"
+#include "krb5_env.h"
+
+#if defined(HAVE_ADS)
 
 /****************************************************************
@@ -29 +33 @@
 static NTSTATUS keytab_ad_connect(TALLOC_CTX *mem_ctx,
                                   const char *domain_name,
+                                  const char *dc,
                                   const char *username,
                                   const char *password,
                                   struct libnet_keytab_context *ctx)
 {
-        NTSTATUS status;
         ADS_STATUS ad_status;
         ADS_STRUCT *ads;
-        struct netr_DsRGetDCNameInfo *info = NULL;
-        const char *dc;
-
-        status = dsgetdcname(mem_ctx, NULL, domain_name, NULL, NULL, 0, &info);
-        if (!NT_STATUS_IS_OK(status)) {
-                return status;
-        }
-
-        dc = strip_hostname(info->dc_unc);
 
         ads = ads_init(NULL, domain_name, dc);
@@ -116 +111 @@
         uint64_t old_sequence_num = 0;
         const char *principal = NULL;
+        struct netr_DsRGetDCNameInfo *info = NULL;
+        const char *dc;
 
         ret = libnet_keytab_init(mem_ctx, ctx->output_filename, &keytab_ctx);
@@ -122 +119 @@
         }
 
+        status = dsgetdcname(mem_ctx, ctx->msg_ctx,
+                             ctx->domain_name, NULL, NULL, 0, &info);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
+
+        dc = strip_hostname(info->dc_unc);
+
         keytab_ctx->clean_old_entries = ctx->clean_old_entries;
         ctx->private_data = keytab_ctx;
@@ -127 +132 @@
         status = keytab_ad_connect(mem_ctx,
                                    ctx->domain_name,
+                                   dc,
                                    ctx->username,
                                    ctx->password,
@@ -294 +300 @@
 }
 
-#endif /* defined(HAVE_ADS) && defined(ENCTYPE_ARCFOUR_HMAC) */
+#endif /* defined(HAVE_ADS) */
 
 const struct samsync_ops libnet_samsync_keytab_ops = {

vendor/current/source3/libnet/libnet_samsync_ldif.c

@@ -26 +26 @@
 #include "includes.h"
 #include "libnet/libnet_samsync.h"
+#include "smbldap.h"
+#include "transfer_file.h"
+#include "passdb.h"
 
 #ifdef HAVE_LDAP
@@ -84 +87 @@
                 len = strlen(suffix);
                 suffix_attr = (char*)SMB_MALLOC(len+1);
+                if (!suffix_attr) {
+                        return NT_STATUS_NO_MEMORY;
+                }
                 memcpy(suffix_attr, suffix, len);
                 suffix_attr[len] = '\0';

vendor/current/source3/libnet/libnet_samsync_passdb.c

@@ -25 +25 @@
 
 #include "includes.h"
-#include "libnet/libnet.h"
+#include "system/passwd.h"
+#include "libnet/libnet_samsync.h"
+#include "../libcli/security/security.h"
+#include "passdb.h"
 
 /* Convert a struct samu_DELTA to a struct samu. */
@@ -179 +182 @@
                 pdb_sethexhours(newstr, r->logon_hours.bits);
                 if (!strequal(oldstr, newstr))
-                        pdb_set_hours(account, r->logon_hours.bits, PDB_CHANGED);
+                        pdb_set_hours(account, r->logon_hours.bits,
+                                      pdb_get_hours_len(account), PDB_CHANGED);
         }
 
@@ -300 +304 @@
         GROUP_MAP map;
         struct group *grp;
-        DOM_SID user_sid;
-        DOM_SID group_sid;
+        struct dom_sid user_sid;
+        struct dom_sid group_sid;
         struct passwd *passwd = NULL;
         fstring sid_string;
@@ -319 +323 @@
         }
 
-        sid_copy(&user_sid, get_global_sam_sid());
-        sid_append_rid(&user_sid, r->rid);
+        sid_compose(&user_sid, get_global_sam_sid(), r->rid);
 
         DEBUG(3, ("Attempting to find SID %s for user %s in the passdb\n",
@@ -387 +390 @@
         fstring comment;
         struct group *grp = NULL;
-        DOM_SID group_sid;
+        struct dom_sid group_sid;
         fstring sid_string;
         GROUP_MAP map;
@@ -396 +399 @@
 
         /* add the group to the mapping table */
-        sid_copy(&group_sid, get_global_sam_sid());
-        sid_append_rid(&group_sid, rid);
+        sid_compose(&group_sid, get_global_sam_sid(), rid);
         sid_to_fstring(sid_string, &group_sid);
 
@@ -452 +454 @@
         char **nt_members = NULL;
         char **unix_members;
-        DOM_SID group_sid;
+        struct dom_sid group_sid;
         GROUP_MAP map;
         struct group *grp;
@@ -460 +462 @@
         }
 
-        sid_copy(&group_sid, get_global_sam_sid());
-        sid_append_rid(&group_sid, rid);
+        sid_compose(&group_sid, get_global_sam_sid(), rid);
 
         if (!get_domain_group_from_sid(group_sid, &map)) {
@@ -486 +487 @@
         for (i=0; i < r->num_rids; i++) {
                 struct samu *member = NULL;
-                DOM_SID member_sid;
+                struct dom_sid member_sid;
 
                 if ( !(member = samu_new(mem_ctx)) ) {
@@ -492 +493 @@
                 }
 
-                sid_copy(&member_sid, get_global_sam_sid());
-                sid_append_rid(&member_sid, r->rids[i]);
+                sid_compose(&member_sid, get_global_sam_sid(), r->rids[i]);
 
                 if (!pdb_getsampwsid(member, &member_sid)) {
@@ -574 +574 @@
                                  uint32_t rid,
                                  struct netr_DELTA_ALIAS *r,
-                                 const DOM_SID *dom_sid)
+                                 const struct dom_sid *dom_sid)
 {
         fstring name;
         fstring comment;
         struct group *grp = NULL;
-        DOM_SID alias_sid;
+        struct dom_sid alias_sid;
         fstring sid_string;
         GROUP_MAP map;
@@ -588 +588 @@
 
         /* Find out whether the group is already mapped */
-        sid_copy(&alias_sid, dom_sid);
-        sid_append_rid(&alias_sid, rid);
+        sid_compose(&alias_sid, dom_sid, rid);
         sid_to_fstring(sid_string, &alias_sid);
 
@@ -614 +613 @@
         map.sid = alias_sid;
 
-        if (sid_equal(dom_sid, &global_sid_Builtin))
+        if (dom_sid_equal(dom_sid, &global_sid_Builtin))
                 map.sid_name_use = SID_NAME_WKN_GRP;
         else
@@ -636 +635 @@
                                 uint32_t rid,
                                 struct netr_DELTA_ALIAS_MEMBER *r,
-                                const DOM_SID *dom_sid)
+                                const struct dom_sid *dom_sid)
 {
         return NT_STATUS_OK;