diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
| commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
| tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source3/libgpo/gpext/scripts.c | |
| parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
| parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
| download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source3/libgpo/gpext/scripts.c')
| -rw-r--r-- | source3/libgpo/gpext/scripts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/libgpo/gpext/scripts.c b/source3/libgpo/gpext/scripts.c index c07407c3f0..02c3abaa1e 100644 --- a/source3/libgpo/gpext/scripts.c +++ b/source3/libgpo/gpext/scripts.c @@ -93,7 +93,7 @@ static NTSTATUS generate_gp_registry_entry(TALLOC_CTX *mem_ctx, data->type = data_type; switch (data->type) { case REG_QWORD: - data->v.qword = (uint64_t)data_p; + data->v.qword = *(uint64_t *)data_p; break; case REG_SZ: data->v.sz.str = talloc_strdup(mem_ctx, (char *)data_p); |