diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-11-28 13:09:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:16:10 -0500 |
| commit | f1d492d11f4da7bbff883fefc3d8fcb71f08f67b (patch) | |
| tree | fab610f3306c1c7ae3b8f88b603dfc1cdf3235f9 /source3/rpc_server | |
| parent | 7ef185fae7fc43b566dedb267023cf8d346baee2 (diff) | |
| download | samba-f1d492d11f4da7bbff883fefc3d8fcb71f08f67b.tar.gz samba-f1d492d11f4da7bbff883fefc3d8fcb71f08f67b.tar.xz samba-f1d492d11f4da7bbff883fefc3d8fcb71f08f67b.zip | |
r19930: Revert the winreg idl changes. At least enumkey does not work anymore today.
With more than 5 different trees I can't swear that I did test this properly
yesterday. Sorry for the noise.
Volker
(This used to be commit 978a6196bf0a2280c7f74b4a6d9fa7941c3aa049)
Diffstat (limited to 'source3/rpc_server')
| -rw-r--r-- | source3/rpc_server/srv_winreg_nt.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/source3/rpc_server/srv_winreg_nt.c b/source3/rpc_server/srv_winreg_nt.c index 79a2d82ae1..52de236bce 100644 --- a/source3/rpc_server/srv_winreg_nt.c +++ b/source3/rpc_server/srv_winreg_nt.c @@ -574,10 +574,7 @@ WERROR _winreg_GetVersion(pipes_struct *p, struct policy_handle *handle, uint32_ Implementation of REG_ENUM_KEY ****************************************************************************/ -WERROR _winreg_EnumKey(pipes_struct *p, struct policy_handle *handle, - uint32_t enum_index, struct winreg_StringBuf *name, - struct winreg_StringBuf **keyclass, - NTTIME **last_changed_time) +WERROR _winreg_EnumKey(pipes_struct *p, struct policy_handle *handle, uint32_t enum_index, struct winreg_StringBuf *name, struct winreg_StringBuf *keyclass, NTTIME *last_changed_time) { WERROR status = WERR_OK; struct regkey_info *info = find_regkey_info_by_hnd( p, handle ); @@ -616,12 +613,10 @@ WERROR _winreg_EnumKey(pipes_struct *p, struct policy_handle *handle, p->mem_ctx, info->subkey_cache->subkeys[enum_index]))) { status = WERR_NOMEM; } - if ( *last_changed_time ) { - **last_changed_time = 0; - } - if ( *keyclass ) { - (*keyclass)->name = ""; + if ( last_changed_time ) { + *last_changed_time = 0; } + keyclass->name = ""; return status; } @@ -1201,7 +1196,7 @@ WERROR _winreg_CreateKey( pipes_struct *p, struct policy_handle *handle, uint32_t options, uint32_t access_mask, struct winreg_SecBuf *secdesc, struct policy_handle *new_handle, - enum winreg_CreateAction **action_taken ) + enum winreg_CreateAction *action_taken ) { struct regkey_info *parent = find_regkey_info_by_hnd(p, handle); struct regkey_info *newparentinfo, *keyinfo; @@ -1293,8 +1288,8 @@ WERROR _winreg_CreateKey( pipes_struct *p, struct policy_handle *handle, /* FIXME: report the truth here */ - if ( *action_taken ) { - **action_taken = REG_CREATED_NEW_KEY; + if ( action_taken ) { + *action_taken = REG_CREATED_NEW_KEY; } done: |