The branch, master has been updated
via 6eee3be libgpo/security_CSE: more preamble header checks of
SecEdit/GptTmpl.inf files.
via 07ef84f libgpo/security_CSE: fix unicode preamble check of
SecEdit/GptTmpl.inf files.
via 12c7b94 libgpo: add gp_inifile_getbool().
via c329a6a libgpo: fix segfault in gpo_process_gpo_list().
via 67e0eaa libgpo: make sure we correctly can store the group policy
state.
via bc870ee libgpo: remove use of deprecated talloc functions.
via feffac8 libgpo: remove unused libgpo wscript_build.
via 36abc1c libgpo: use existing connection to the ds for the sysvol
queries.
via 24cc4d5 libgpo: remove unused loadparm_context from functions.
via b756e02 libgpo: remove duplicate parse_gpt_ini header.
from e26736d tevent: version 0.9.20
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6eee3befc813de5f6e8b4a10b9e2cc9724ed6c06
Author: Günther Deschner <[email protected]>
Date: Wed Dec 11 00:59:55 2013 +0100
libgpo/security_CSE: more preamble header checks of SecEdit/GptTmpl.inf
files.
$CHICAGO$ needs to be double quoted.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
Autobuild-Date(master): Thu Dec 12 15:31:14 CET 2013 on sn-devel-104
commit 07ef84fa02b0dd51786ef6cd82ab4d24905f33a6
Author: Günther Deschner <[email protected]>
Date: Wed Dec 11 00:50:03 2013 +0100
libgpo/security_CSE: fix unicode preamble check of SecEdit/GptTmpl.inf
files.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 12c7b9498c02e75440e3923cdc4b8c6e03f8afd8
Author: Günther Deschner <[email protected]>
Date: Wed Dec 11 00:44:49 2013 +0100
libgpo: add gp_inifile_getbool().
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit c329a6abcc236101665d2453a70375d740b73944
Author: Günther Deschner <[email protected]>
Date: Tue Dec 10 18:06:14 2013 +0100
libgpo: fix segfault in gpo_process_gpo_list().
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 67e0eaa1d04c91f17fe8f0e50b446385517625f5
Author: Günther Deschner <[email protected]>
Date: Tue Dec 10 17:39:54 2013 +0100
libgpo: make sure we correctly can store the group policy state.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit bc870ee8453640049827136d48f49b9e6cccc594
Author: Günther Deschner <[email protected]>
Date: Tue Dec 10 23:44:23 2013 +0100
libgpo: remove use of deprecated talloc functions.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit feffac806800c1740521133e88a7ac777ce8f368
Author: Günther Deschner <[email protected]>
Date: Tue Dec 10 23:18:17 2013 +0100
libgpo: remove unused libgpo wscript_build.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 36abc1c4e63a9a69fe748bb6c1146e5ab0e9117d
Author: Günther Deschner <[email protected]>
Date: Tue Dec 10 22:50:47 2013 +0100
libgpo: use existing connection to the ds for the sysvol queries.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit 24cc4d5ac1a44f66322b3e8bfd17f266fcac0e22
Author: Günther Deschner <[email protected]>
Date: Tue Dec 10 18:26:51 2013 +0100
libgpo: remove unused loadparm_context from functions.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
commit b756e02ac49bf23b07a0e2b8565177555481418a
Author: Günther Deschner <[email protected]>
Date: Tue Dec 10 10:10:22 2013 +0100
libgpo: remove duplicate parse_gpt_ini header.
Guenther
Signed-off-by: Günther Deschner <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
libgpo/gpo.h | 5 ----
libgpo/gpo_fetch.c | 7 ++---
libgpo/gpo_ini.c | 24 ++++++++++++++++++++++
libgpo/gpo_ini.h | 1 +
libgpo/gpo_ldap.c | 1 -
libgpo/gpo_util.c | 42 +++++++++++++++++++-------------------
libgpo/wscript_build | 8 -------
source3/libgpo/gpext/security.c | 6 ++--
source3/libgpo/gpo_proto.h | 7 ------
source3/libgpo/gpo_reg.c | 6 ++--
source3/utils/net_ads_gpo.c | 7 ++---
11 files changed, 58 insertions(+), 56 deletions(-)
delete mode 100644 libgpo/wscript_build
Changeset truncated at 500 lines:
diff --git a/libgpo/gpo.h b/libgpo/gpo.h
index 62e9091..6e677c9 100644
--- a/libgpo/gpo.h
+++ b/libgpo/gpo.h
@@ -20,7 +20,6 @@
#ifndef __GPO_H__
#define __GPO_H__
-struct loadparm_context;
#include "ads.h"
enum GPO_LINK_TYPE {
@@ -176,7 +175,6 @@ NTSTATUS gpo_explode_filesyspath(TALLOC_CTX *mem_ctx,
char **unix_path);
NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
ADS_STRUCT *ads,
- struct loadparm_context *lp_ctx,
const char *cache_dir,
struct GROUP_POLICY_OBJECT *gpo);
NTSTATUS gpo_get_sysvol_gpt_version(TALLOC_CTX *mem_ctx,
@@ -255,13 +253,11 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads,
NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
TALLOC_CTX *mem_ctx,
const char *cache_dir,
- struct loadparm_context *lp_ctx,
uint32_t flags,
struct GROUP_POLICY_OBJECT *gpo);
NTSTATUS check_refresh_gpo_list(ADS_STRUCT *ads,
TALLOC_CTX *mem_ctx,
const char *cache_dir,
- struct loadparm_context *lp_ctx,
uint32_t flags,
struct GROUP_POLICY_OBJECT *gpo_list);
NTSTATUS gpo_get_unix_path(TALLOC_CTX *mem_ctx,
@@ -276,7 +272,6 @@ NTSTATUS gp_find_file(TALLOC_CTX *mem_ctx,
const char **filename_out);
ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads,
TALLOC_CTX *mem_ctx,
- struct loadparm_context *lp_ctx,
const char *dn,
struct security_token **token);
diff --git a/libgpo/gpo_fetch.c b/libgpo/gpo_fetch.c
index 4e895bf..9fdff7c 100644
--- a/libgpo/gpo_fetch.c
+++ b/libgpo/gpo_fetch.c
@@ -118,7 +118,7 @@ static NTSTATUS gpo_prepare_local_store(TALLOC_CTX *mem_ctx,
return NT_STATUS_OK;
}
-static NTSTATUS gpo_connect_server(ADS_STRUCT *ads, struct loadparm_context
*lp_ctx,
+static NTSTATUS gpo_connect_server(ADS_STRUCT *ads,
const char *server, const char *service,
void *ret_cli)
{
NTSTATUS result;
@@ -150,7 +150,6 @@ static NTSTATUS gpo_connect_server(ADS_STRUCT *ads, struct
loadparm_context *lp_
NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
ADS_STRUCT *ads,
- struct loadparm_context *lp_ctx,
const char *cache_dir,
struct GROUP_POLICY_OBJECT *gpo)
{
@@ -165,11 +164,11 @@ NTSTATUS gpo_fetch_files(TALLOC_CTX *mem_ctx,
&unix_path);
NT_STATUS_NOT_OK_RETURN(result);
+ /* for now reuse the existing ds connection */
- result = gpo_connect_server(ads, lp_ctx, server, service, &cli);
+ result = gpo_connect_server(ads, ads->server.ldap_server, service,
&cli);
NT_STATUS_NOT_OK_RETURN(result);
-
result = gpo_prepare_local_store(mem_ctx, cache_dir, unix_path);
NT_STATUS_NOT_OK_RETURN(result);
diff --git a/libgpo/gpo_ini.c b/libgpo/gpo_ini.c
index a2cb106..1f69eec 100644
--- a/libgpo/gpo_ini.c
+++ b/libgpo/gpo_ini.c
@@ -165,6 +165,30 @@ NTSTATUS gp_inifile_getint(struct gp_inifile_context *ctx,
const char *key, int
/****************************************************************
****************************************************************/
+NTSTATUS gp_inifile_getbool(struct gp_inifile_context *ctx, const char *key,
bool *ret)
+{
+ char *value;
+ NTSTATUS result;
+
+ result = gp_inifile_getstring(ctx,key, &value);
+ if (!NT_STATUS_IS_OK(result)) {
+ return result;
+ }
+
+ if (strequal(value, "Yes")) {
+ *ret = true;
+ return NT_STATUS_OK;
+ } else if (strequal(value, "No")) {
+ *ret = false;
+ return NT_STATUS_OK;
+ }
+
+ return NT_STATUS_NOT_FOUND;
+}
+
+/****************************************************************
+****************************************************************/
+
NTSTATUS gp_inifile_init_context(TALLOC_CTX *mem_ctx,
uint32_t flags,
const char *unix_path,
diff --git a/libgpo/gpo_ini.h b/libgpo/gpo_ini.h
index 1f3fa56..c9afec0 100644
--- a/libgpo/gpo_ini.h
+++ b/libgpo/gpo_ini.h
@@ -42,4 +42,5 @@ NTSTATUS parse_gpt_ini(TALLOC_CTX *ctx,
char **display_name);
NTSTATUS gp_inifile_getstring(struct gp_inifile_context *ctx, const char *key,
char **ret);
NTSTATUS gp_inifile_getint(struct gp_inifile_context *ctx, const char *key,
int *ret);
+NTSTATUS gp_inifile_getbool(struct gp_inifile_context *ctx, const char *key,
bool *ret);
diff --git a/libgpo/gpo_ldap.c b/libgpo/gpo_ldap.c
index 803e027..d46c48f 100644
--- a/libgpo/gpo_ldap.c
+++ b/libgpo/gpo_ldap.c
@@ -21,7 +21,6 @@
#include "libgpo/gpo.h"
#include "auth.h"
#include "../libcli/security/security.h"
-#include "lib/param/loadparm.h"
/****************************************************************
parse the raw extension string into a GP_EXT structure
diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index cfb4512..b38a40c 100644
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -16,14 +16,15 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#define TALLOC_DEPRECATED 1
+
#include "includes.h"
#include "system/filesys.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "../librpc/gen_ndr/ndr_security.h"
#include "../libgpo/gpo.h"
#include "../libcli/security/security.h"
-#undef strdup
+#include "registry.h"
+#include "libgpo/gpo_proto.h"
#if 0
#define DEFAULT_DOMAIN_POLICY "Default Domain Policy"
@@ -549,9 +550,8 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads,
struct gp_extension *gp_ext = NULL;
struct registry_key *root_key = NULL;
struct gp_registry_context *reg_ctx = NULL;
-#if 0
WERROR werr;
-#endif
+
status = ADS_ERROR_NT(init_gp_extensions(mem_ctx));
if (!ADS_ERR_OK(status)) {
return status;
@@ -561,8 +561,7 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads,
if (!gp_ext_list) {
return ADS_ERROR_NT(NT_STATUS_DLL_INIT_FAILED);
}
-/* FIXME Needs to be replaced with new patchfile_preg calls */
-#if 0
+
/* get the key here */
if (flags & GPO_LIST_FLAG_MACHINE) {
werr = gp_init_reg_ctx(mem_ctx, KEY_HKLM, REG_KEY_WRITE,
@@ -577,7 +576,6 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads,
talloc_free(reg_ctx);
return ADS_ERROR_NT(werror_to_ntstatus(werr));
}
-#endif
root_key = reg_ctx->curr_key;
@@ -626,7 +624,6 @@ ADS_STATUS gpo_process_gpo_list(ADS_STRUCT *ads,
NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
TALLOC_CTX *mem_ctx,
const char *cache_dir,
- struct loadparm_context *lp_ctx,
uint32_t flags,
struct GROUP_POLICY_OBJECT *gpo)
{
@@ -666,7 +663,7 @@ NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
DEBUG(1,("check_refresh_gpo: need to refresh GPO\n"));
- result = gpo_fetch_files(mem_ctx, ads, lp_ctx, cache_dir, gpo);
+ result = gpo_fetch_files(mem_ctx, ads, cache_dir, gpo);
if (!NT_STATUS_IS_OK(result)) {
goto out;
}
@@ -713,7 +710,6 @@ NTSTATUS check_refresh_gpo(ADS_STRUCT *ads,
NTSTATUS check_refresh_gpo_list(ADS_STRUCT *ads,
TALLOC_CTX *mem_ctx,
const char *cache_dir,
- struct loadparm_context *lp_ctx,
uint32_t flags,
struct GROUP_POLICY_OBJECT *gpo_list)
{
@@ -726,7 +722,7 @@ NTSTATUS check_refresh_gpo_list(ADS_STRUCT *ads,
for (gpo = gpo_list; gpo; gpo = gpo->next) {
- result = check_refresh_gpo(ads, mem_ctx, cache_dir, lp_ctx,
flags, gpo);
+ result = check_refresh_gpo(ads, mem_ctx, cache_dir, flags, gpo);
if (!NT_STATUS_IS_OK(result)) {
goto out;
}
@@ -764,24 +760,29 @@ char *gpo_flag_str(TALLOC_CTX *ctx, uint32_t flags)
return NULL;
}
+ str = talloc_strdup(ctx, "");
+ if (!str) {
+ return NULL;
+ }
+
if (flags & GPO_INFO_FLAG_SLOWLINK)
- str = talloc_append_string(ctx, str, "GPO_INFO_FLAG_SLOWLINK ");
+ str = talloc_strdup_append(str, "GPO_INFO_FLAG_SLOWLINK ");
if (flags & GPO_INFO_FLAG_VERBOSE)
- str = talloc_append_string(ctx, str, "GPO_INFO_FLAG_VERBOSE ");
+ str = talloc_strdup_append(str, "GPO_INFO_FLAG_VERBOSE ");
if (flags & GPO_INFO_FLAG_SAFEMODE_BOOT)
- str = talloc_append_string(ctx, str,
"GPO_INFO_FLAG_SAFEMODE_BOOT ");
+ str = talloc_strdup_append(str, "GPO_INFO_FLAG_SAFEMODE_BOOT ");
if (flags & GPO_INFO_FLAG_NOCHANGES)
- str = talloc_append_string(ctx, str, "GPO_INFO_FLAG_NOCHANGES
");
+ str = talloc_strdup_append(str, "GPO_INFO_FLAG_NOCHANGES ");
if (flags & GPO_INFO_FLAG_MACHINE)
- str = talloc_append_string(ctx, str, "GPO_INFO_FLAG_MACHINE ");
+ str = talloc_strdup_append(str, "GPO_INFO_FLAG_MACHINE ");
if (flags & GPO_INFO_FLAG_LOGRSOP_TRANSITION)
- str = talloc_append_string(ctx, str,
"GPO_INFO_FLAG_LOGRSOP_TRANSITION ");
+ str = talloc_strdup_append(str,
"GPO_INFO_FLAG_LOGRSOP_TRANSITION ");
if (flags & GPO_INFO_FLAG_LINKTRANSITION)
- str = talloc_append_string(ctx, str,
"GPO_INFO_FLAG_LINKTRANSITION ");
+ str = talloc_strdup_append(str, "GPO_INFO_FLAG_LINKTRANSITION
");
if (flags & GPO_INFO_FLAG_FORCED_REFRESH)
- str = talloc_append_string(ctx, str,
"GPO_INFO_FLAG_FORCED_REFRESH ");
+ str = talloc_strdup_append(str, "GPO_INFO_FLAG_FORCED_REFRESH
");
if (flags & GPO_INFO_FLAG_BACKGROUND)
- str = talloc_append_string(ctx, str, "GPO_INFO_FLAG_BACKGROUND
");
+ str = talloc_strdup_append(str, "GPO_INFO_FLAG_BACKGROUND ");
return str;
}
@@ -834,7 +835,6 @@ NTSTATUS gp_find_file(TALLOC_CTX *mem_ctx,
ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads,
TALLOC_CTX *mem_ctx,
- struct loadparm_context *lp_ctx,
const char *dn,
struct security_token **token)
{
diff --git a/libgpo/wscript_build b/libgpo/wscript_build
deleted file mode 100644
index f182b44..0000000
--- a/libgpo/wscript_build
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env python
-
-bld.SAMBA_SUBSYSTEM('LIBGPO',
- source='gpo_util.c gpo_sec.c ../libgpo/gpext/gpext.c gpo_fetch.c
gpo_ini.c ../source4/libgpo/ads_convenience.c ../source3/libgpo/gpo_filesync.c
../source4/libgpo/gpo_filesync.c',
- deps='ldb samba-net samba-util',
- enabled=False
- )
-
diff --git a/source3/libgpo/gpext/security.c b/source3/libgpo/gpext/security.c
index b68840d..2322bce 100644
--- a/source3/libgpo/gpext/security.c
+++ b/source3/libgpo/gpext/security.c
@@ -55,7 +55,7 @@ struct gpttmpl_table {
#define GPTTMPL_PARAMETER_REVISION "Revision"
#define GPTTMPL_PARAMETER_SIGNATURE "signature"
-#define GPTTMPL_VALUE_CHICAGO "$CHICAGO$" /* whatever this is good for... */
+#define GPTTMPL_VALUE_CHICAGO "\"$CHICAGO$\"" /* whatever this is good for...
*/
#define GPTTMPL_PARAMETER_UNICODE "Unicode"
static NTSTATUS gpttmpl_parse_header(struct gp_inifile_context *ini_ctx,
@@ -64,7 +64,7 @@ static NTSTATUS gpttmpl_parse_header(struct
gp_inifile_context *ini_ctx,
char *signature = NULL;
NTSTATUS result;
int version;
- int is_unicode;
+ bool is_unicode = false;
if (!ini_ctx) {
return NT_STATUS_INVALID_PARAMETER;
@@ -89,7 +89,7 @@ static NTSTATUS gpttmpl_parse_header(struct
gp_inifile_context *ini_ctx,
*version_out = version;
}
- result = gp_inifile_getint(ini_ctx, GPTTMPL_SECTION_UNICODE
+ result = gp_inifile_getbool(ini_ctx, GPTTMPL_SECTION_UNICODE
":"GPTTMPL_PARAMETER_UNICODE, &is_unicode);
if (!NT_STATUS_IS_OK(result) || !is_unicode) {
return NT_STATUS_INTERNAL_DB_CORRUPTION;
diff --git a/source3/libgpo/gpo_proto.h b/source3/libgpo/gpo_proto.h
index fa2f873..32a61ea 100644
--- a/source3/libgpo/gpo_proto.h
+++ b/source3/libgpo/gpo_proto.h
@@ -32,13 +32,6 @@ NTSTATUS gpo_sync_directories(TALLOC_CTX *mem_ctx,
const char *nt_path,
const char *local_path);
-/* The following definitions come from libgpo/gpo_ini.c */
-
-NTSTATUS parse_gpt_ini(TALLOC_CTX *mem_ctx,
- const char *filename,
- uint32_t *version,
- char **display_name);
-
/* The following definitions come from libgpo/gpo_reg.c */
struct security_token *registry_create_system_token(TALLOC_CTX *mem_ctx);
diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c
index 5142e91..d35c7db 100644
--- a/source3/libgpo/gpo_reg.c
+++ b/source3/libgpo/gpo_reg.c
@@ -285,7 +285,7 @@ static WERROR gp_store_reg_gpovals(TALLOC_CTX *mem_ctx,
W_ERROR_NOT_OK_RETURN(werr);
werr = gp_store_reg_val_sz(mem_ctx, key, "SOM",
- gpo->link);
+ gpo->link ? gpo->link : "");
W_ERROR_NOT_OK_RETURN(werr);
werr = gp_store_reg_val_sz(mem_ctx, key, "DisplayName",
@@ -293,7 +293,7 @@ static WERROR gp_store_reg_gpovals(TALLOC_CTX *mem_ctx,
W_ERROR_NOT_OK_RETURN(werr);
werr = gp_store_reg_val_sz(mem_ctx, key, "WQL-Id",
- NULL);
+ "");
W_ERROR_NOT_OK_RETURN(werr);
return werr;
@@ -542,7 +542,7 @@ WERROR gp_reg_state_store(TALLOC_CTX *mem_ctx,
werr = gp_store_reg_gpovals(mem_ctx, key, gpo);
if (!W_ERROR_IS_OK(werr)) {
DEBUG(0,("gp_reg_state_store: "
- "gpo_store_reg_gpovals failed for %s: %s\n",
+ "gp_store_reg_gpovals failed for %s: %s\n",
gpo->display_name, win_errstr(werr)));
goto done;
}
diff --git a/source3/utils/net_ads_gpo.c b/source3/utils/net_ads_gpo.c
index 56451ab..7c397e6 100644
--- a/source3/utils/net_ads_gpo.c
+++ b/source3/utils/net_ads_gpo.c
@@ -78,7 +78,7 @@ static int net_ads_gpo_refresh(struct net_context *c, int
argc, const char **arg
d_printf(_("* fetching token "));
if (uac & UF_WORKSTATION_TRUST_ACCOUNT) {
- status = gp_get_machine_token(ads, mem_ctx, NULL, dn, &token);
+ status = gp_get_machine_token(ads, mem_ctx, dn, &token);
} else {
status = ads_get_sid_token(ads, mem_ctx, dn, &token);
}
@@ -101,7 +101,6 @@ static int net_ads_gpo_refresh(struct net_context *c, int
argc, const char **arg
d_printf(_("* Refreshing Group Policy Data "));
if (!NT_STATUS_IS_OK(result = check_refresh_gpo_list(ads, mem_ctx,
cache_path(GPO_CACHE_DIR),
- NULL,
flags,
gpo_list))) {
d_printf(_("failed: %s\n"), nt_errstr(result));
@@ -337,7 +336,7 @@ static int net_ads_gpo_list(struct net_context *c, int
argc, const char **argv)
argv[0], dn);
if (uac & UF_WORKSTATION_TRUST_ACCOUNT) {
- status = gp_get_machine_token(ads, mem_ctx, NULL, dn, &token);
+ status = gp_get_machine_token(ads, mem_ctx, dn, &token);
} else {
status = ads_get_sid_token(ads, mem_ctx, dn, &token);
}
@@ -420,7 +419,7 @@ static int net_ads_gpo_apply(struct net_context *c, int
argc, const char **argv)
argv[0], dn);
if (uac & UF_WORKSTATION_TRUST_ACCOUNT) {
- status = gp_get_machine_token(ads, mem_ctx, NULL, dn, &token);
+ status = gp_get_machine_token(ads, mem_ctx, dn, &token);
} else {
status = ads_get_sid_token(ads, mem_ctx, dn, &token);
}
--
Samba Shared Repository
