diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 16:39:35 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 16:39:35 +0100 |
| commit | 09ac816b36e45fd537af2f7fe7c57a11f5c744f5 (patch) | |
| tree | 4d5d44c27a2395a39efc62359f6e4b6976f2ba2e /source3/registry/regfio.c | |
| parent | 235244f4cc707130dd130afce88bde49606bd501 (diff) | |
| parent | 54bc27e9374742d37b1ed9012d1cfe8f5ace6d40 (diff) | |
| download | samba-09ac816b36e45fd537af2f7fe7c57a11f5c744f5.tar.gz samba-09ac816b36e45fd537af2f7fe7c57a11f5c744f5.tar.bz2 samba-09ac816b36e45fd537af2f7fe7c57a11f5c744f5.zip | |
Merge branch 'master' of git://git.samba.org/samba into teventfix
Conflicts:
lib/tevent/pytevent.c
Diffstat (limited to 'source3/registry/regfio.c')
| -rw-r--r-- | source3/registry/regfio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/registry/regfio.c b/source3/registry/regfio.c index 5395f225f1..d002bd72e7 100644 --- a/source3/registry/regfio.c +++ b/source3/registry/regfio.c @@ -1693,7 +1693,7 @@ static int hashrec_cmp( REGF_HASH_REC *h1, REGF_HASH_REC *h2 ) *******************************************************************/ REGF_NK_REC* regfio_write_key( REGF_FILE *file, const char *name, - REGVAL_CTR *values, REGSUBKEY_CTR *subkeys, + REGVAL_CTR *values, struct regsubkey_ctr *subkeys, SEC_DESC *sec_desc, REGF_NK_REC *parent ) { REGF_NK_REC *nk; |