diff options
| author | bubulle <bubulle@alioth.debian.org> | 2011-11-12 13:00:54 +0000 |
|---|---|---|
| committer | bubulle <bubulle@alioth.debian.org> | 2011-11-12 13:00:54 +0000 |
| commit | 6fba685eec3a1165ec0b82d72d3ae71e946a1404 (patch) | |
| tree | f3c0543c8f9df4a22ed62e3bd99d9d7bc1054c14 /libcli/drsuapi | |
| parent | 77a7925c0509068d5cd2affd94a3996d0a86035a (diff) | |
| download | samba-6fba685eec3a1165ec0b82d72d3ae71e946a1404.tar.gz | |
Merge upstream 3.6.1 source
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@3972 fc4039ab-9d04-0410-8cac-899223bdd6b0
Diffstat (limited to 'libcli/drsuapi')
| -rw-r--r-- | libcli/drsuapi/config.mk | 6 | ||||
| -rw-r--r-- | libcli/drsuapi/repl_decrypt.c | 44 | ||||
| -rw-r--r-- | libcli/drsuapi/wscript_build | 8 |
3 files changed, 30 insertions, 28 deletions
diff --git a/libcli/drsuapi/config.mk b/libcli/drsuapi/config.mk deleted file mode 100644 index 4c68702280..0000000000 --- a/libcli/drsuapi/config.mk +++ /dev/null @@ -1,6 +0,0 @@ -[SUBSYSTEM::LIBCLI_DRSUAPI] -PUBLIC_DEPENDENCIES = \ - LIBCLI_AUTH - -LIBCLI_DRSUAPI_OBJ_FILES = $(addprefix $(libclicommonsrcdir)/drsuapi/, \ - repl_decrypt.o) diff --git a/libcli/drsuapi/repl_decrypt.c b/libcli/drsuapi/repl_decrypt.c index 924e79992f..6fff2fe5b1 100644 --- a/libcli/drsuapi/repl_decrypt.c +++ b/libcli/drsuapi/repl_decrypt.c @@ -146,19 +146,19 @@ WERROR drsuapi_decrypt_attribute(TALLOC_CTX *mem_ctx, } switch (attr->attid) { - case DRSUAPI_ATTRIBUTE_dBCSPwd: - case DRSUAPI_ATTRIBUTE_unicodePwd: - case DRSUAPI_ATTRIBUTE_ntPwdHistory: - case DRSUAPI_ATTRIBUTE_lmPwdHistory: + case DRSUAPI_ATTID_dBCSPwd: + case DRSUAPI_ATTID_unicodePwd: + case DRSUAPI_ATTID_ntPwdHistory: + case DRSUAPI_ATTID_lmPwdHistory: rid_crypt = true; break; - case DRSUAPI_ATTRIBUTE_supplementalCredentials: - case DRSUAPI_ATTRIBUTE_priorValue: - case DRSUAPI_ATTRIBUTE_currentValue: - case DRSUAPI_ATTRIBUTE_trustAuthOutgoing: - case DRSUAPI_ATTRIBUTE_trustAuthIncoming: - case DRSUAPI_ATTRIBUTE_initialAuthOutgoing: - case DRSUAPI_ATTRIBUTE_initialAuthIncoming: + case DRSUAPI_ATTID_supplementalCredentials: + case DRSUAPI_ATTID_priorValue: + case DRSUAPI_ATTID_currentValue: + case DRSUAPI_ATTID_trustAuthOutgoing: + case DRSUAPI_ATTID_trustAuthIncoming: + case DRSUAPI_ATTID_initialAuthOutgoing: + case DRSUAPI_ATTID_initialAuthIncoming: break; default: return WERR_OK; @@ -308,19 +308,19 @@ WERROR drsuapi_encrypt_attribute(TALLOC_CTX *mem_ctx, } switch (attr->attid) { - case DRSUAPI_ATTRIBUTE_dBCSPwd: - case DRSUAPI_ATTRIBUTE_unicodePwd: - case DRSUAPI_ATTRIBUTE_ntPwdHistory: - case DRSUAPI_ATTRIBUTE_lmPwdHistory: + case DRSUAPI_ATTID_dBCSPwd: + case DRSUAPI_ATTID_unicodePwd: + case DRSUAPI_ATTID_ntPwdHistory: + case DRSUAPI_ATTID_lmPwdHistory: rid_crypt = true; break; - case DRSUAPI_ATTRIBUTE_supplementalCredentials: - case DRSUAPI_ATTRIBUTE_priorValue: - case DRSUAPI_ATTRIBUTE_currentValue: - case DRSUAPI_ATTRIBUTE_trustAuthOutgoing: - case DRSUAPI_ATTRIBUTE_trustAuthIncoming: - case DRSUAPI_ATTRIBUTE_initialAuthOutgoing: - case DRSUAPI_ATTRIBUTE_initialAuthIncoming: + case DRSUAPI_ATTID_supplementalCredentials: + case DRSUAPI_ATTID_priorValue: + case DRSUAPI_ATTID_currentValue: + case DRSUAPI_ATTID_trustAuthOutgoing: + case DRSUAPI_ATTID_trustAuthIncoming: + case DRSUAPI_ATTID_initialAuthOutgoing: + case DRSUAPI_ATTID_initialAuthIncoming: break; default: return WERR_OK; diff --git a/libcli/drsuapi/wscript_build b/libcli/drsuapi/wscript_build new file mode 100644 index 0000000000..9d9e54df85 --- /dev/null +++ b/libcli/drsuapi/wscript_build @@ -0,0 +1,8 @@ +#!/usr/bin/env python + + +bld.SAMBA_SUBSYSTEM('LIBCLI_DRSUAPI', + source='repl_decrypt.c', + public_deps='LIBCLI_AUTH' + ) + |