diff options
author | Gerald W. Carter <jerry@samba.org> | 2008-04-17 18:11:22 +0200 |
---|---|---|
committer | Gerald W. Carter <jerry@samba.org> | 2008-04-17 18:11:22 +0200 |
commit | 5c29bc8931d025de4ec91247be04da4388642727 (patch) | |
tree | 0345ca3ba451dfdbe2f2bb48745299fe306e6d3f /source3/libgpo | |
parent | 20104eef70ea1e2a64acb762ade2b4d64af0ee57 (diff) | |
parent | d4d706e0fa6ed2c6b8cd1d788257c7bd096a170b (diff) | |
download | samba-5c29bc8931d025de4ec91247be04da4388642727.tar.gz samba-5c29bc8931d025de4ec91247be04da4388642727.tar.bz2 samba-5c29bc8931d025de4ec91247be04da4388642727.zip |
Merge commit 'samba/v3-2-test' into wbc-test
(This used to be commit 7c2e735df3d8a4105a4944411d111fc66c13b01f)
Diffstat (limited to 'source3/libgpo')
-rw-r--r-- | source3/libgpo/gpo_reg.c | 2 | ||||
-rw-r--r-- | source3/libgpo/gpo_util.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c index 7a005d85a2..920deeb189 100644 --- a/source3/libgpo/gpo_reg.c +++ b/source3/libgpo/gpo_reg.c @@ -789,7 +789,7 @@ void dump_reg_val(int lvl, const char *direction, type_str = reg_type_lookup(val->type); - DEBUG(lvl,("\tdump_reg_val: %s '%s' '%s' %s: ", + DEBUG(lvl,("\tdump_reg_val:\t%s '%s'\n\t\t\t'%s' %s: ", direction, key, subkey, type_str)); switch (val->type) { diff --git a/source3/libgpo/gpo_util.c b/source3/libgpo/gpo_util.c index 7105b21de8..04597b3b57 100644 --- a/source3/libgpo/gpo_util.c +++ b/source3/libgpo/gpo_util.c @@ -664,7 +664,8 @@ NTSTATUS check_refresh_gpo(ADS_STRUCT *ads, share, "A:", ads->auth.user_name, NULL, ads->auth.password, - CLI_FULL_CONNECTION_USE_KERBEROS, + CLI_FULL_CONNECTION_USE_KERBEROS | + CLI_FULL_CONNECTION_FALLBACK_AFTER_KERBEROS, Undefined, NULL); if (!NT_STATUS_IS_OK(result)) { DEBUG(10,("check_refresh_gpo: " |