[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha6-395-gbab6294
Stefan Metzmacher
metze at samba.org
Mon Feb 2 12:11:34 GMT 2009
The branch, master has been updated
via bab629426958907e675765ce0620f321dcc5f780 (commit)
via 4bbfdb2ded3b34fe001757c67d6ca617ea781d2e (commit)
via 900a5a6f87d37c1a8cd6bfdc7c24a8d87a83ea48 (commit)
via fb5346f3bbbde389295bb56de3ab97df50ddc2ee (commit)
via 3131ca2340dcdb43257fe9a75c749c93f6931948 (commit)
via 03ed70c9f3485e99b7a9574f076c98a631a358bf (commit)
via b4af7074b789b434f083a89a70c7cf7f8e43f4d4 (commit)
via 0c3bc60a01a3353557abe42f6a689c54b9369e7f (commit)
via 8249a467e365d7dc5eb52fd4c1315870405debb4 (commit)
via 21571e64a9c338b8e0be092f01a99813674b9ed1 (commit)
via aa9c6b58f52b79c644cb894cc25b41cecd79b226 (commit)
via 48a0721606b789a8b5086ae41b7208e753c415c9 (commit)
via 5e6e370c4ed44e2b13d0817f3c1c1c36efb74cba (commit)
via 62a3947d53aa38a2dab5ddf163d41a58a26bff14 (commit)
via 82466db35dd21064f3f3754fb9ebdedaf13566bc (commit)
via 73aea83966851e11923d2f5fd69171be385e22f7 (commit)
via 44625f76c174e97e8a2c03a196358c604e78f694 (commit)
via 45c26648c3545804aeeddb0ca9aa5e2b6a85182b (commit)
via f956dddf57b35408966d58f85864c7274bce15e2 (commit)
via 9c387c189ebb925b22a28f74620b8773c6bf8b32 (commit)
via 87ce6b198ac394f6f683ef125d59c1b18becbc19 (commit)
via d9c30894a1cb3d0814ba281dd6e9f5ca63c987d5 (commit)
via 1441e87e249190bd9fea72773b8fd014a05f9861 (commit)
via 0ac7792e022107c352f5464f52563c4e885272dd (commit)
via e5e0a064853ff5cd7f9bea0d9a6db8a0ae497635 (commit)
via 62c8f6b1a57e3f03965358e5b6c3e55eeb7aaa8b (commit)
via 5bca70a0c275f545433afad624b1e54adc27986d (commit)
via 476aa1f00d298bdbefd92ba9505109167e3dfa1e (commit)
via e08dfe008e63789347cf7dc360b70ba1a1cb5b20 (commit)
via 1bb0104070eb1188ed0256535907f2bed006a939 (commit)
via 24d31c0e81c2332a610bb94acb1227fb9690443a (commit)
via d0ad2ecdeadcfdc99ead63000d484dfba5745ac2 (commit)
via 0fadddf8d417f34dbe964ffd20483d24bf308325 (commit)
via 2dc838341dd9f44437e3782cf49bf8163ec72fd2 (commit)
via 096b4a9bd054650f3f01be41e23b4168686ed9f2 (commit)
via 23bec6c670073fc419908c65918d885e6d9553e2 (commit)
via ab7f003aad6d16103c72ec3330836340e83a230a (commit)
via 35f7cee25db3f4a3db9bfa6d7a12f1d9d6698ca0 (commit)
via 7237d777d5fb208a7ae305090d07c11bb6e6ba34 (commit)
via 100f4e318e2cf61413a70bb269efadc2c73228c8 (commit)
via e3dfbc9b7684e969776d3f7dbc7c4dad4108791b (commit)
via 29cc638c2cfe4ab785d52c3cc61e81dfaf387b29 (commit)
via 5bf95a71ddfeb6d2a77d7b4f488a4f5cf57f00f0 (commit)
via 4523a634cb1702f96cc41099d9761a073c7a6d49 (commit)
via 0854950b34dedbbd03120fa359403e3451161a38 (commit)
via 5e9ee5406049a07d986da83c28c3401dccf1c08a (commit)
via 7bb44616443babf9fa1f755dc5eb245576b3f8c2 (commit)
via 42f92109d2cd5c1ecb58b246de00bd9ede14703f (commit)
via 2110ef3c5d4b2085310f706c62e6bf11299dc2eb (commit)
via 7ee87c339bc328f89d08afc0e5c9e095ceb1f746 (commit)
via 8a95f4d2d6dc4ad3e0434c6f5e53b87ff3fdecb1 (commit)
via 33e8f4772544a457bc2adc200235e065cba3c239 (commit)
via 0c64c213e84f644b39f1c654e0be9ca601173eca (commit)
via 24fb16f1f6d1e5ecbc1c6468bc1f35e7ecb3b0aa (commit)
via 50ad5239fd13fcec2b18eaa2ced55fd0e1b00a65 (commit)
via c463bc127c911dcc3177e208931819ffc2f4fadb (commit)
via 74e783bf5850658124d60503d7b5d2fba8a9bb87 (commit)
via c005bbddb713c25f3201d6007e6ef1114084d041 (commit)
via 58ca4d4e3184580fbd895cec80d01b01768ae378 (commit)
via 71e318cf319606828657338ad49d0ad73ba2cc19 (commit)
via 1ee4bbec1a573be26360568275bd3882837dca9b (commit)
via 0db079b9eb9446f63a3b1c08cd6de34faa0f6088 (commit)
via 8d379008283415a9895ea9b0f9acc262f5859a8d (commit)
via ea7ea27f2f5d729629cf326424ea8b1123b9fc6e (commit)
via 79ae2de00135b3047dcb835c14a3afac6eb168eb (commit)
via 7db458a56c9296c96c65f903a75453ac635a42c8 (commit)
via 735af62105c563f9ee2ffd8bc21e914499d5ee76 (commit)
via b7f298348934e86b1f8026bd445ec167439581f6 (commit)
via 2e82a4ced2282eec55983b443e9e54f57e8b443d (commit)
via e7454d46d4cf6125e14ed7c9a36132eea929f19c (commit)
from 73f4fc1f802f31459b70dba4777d142d00fcdd92 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bab629426958907e675765ce0620f321dcc5f780
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:52:44 2009 +0100
s4:includes: copy #error DONT_USE_CPLUSPLUS_RESERVED_NAMES from source3
We should not use c++ reserved names in source4 too.
metze
commit 4bbfdb2ded3b34fe001757c67d6ca617ea781d2e
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 13:04:40 2009 +0100
s4:torture/rpc: avoid 'delete' and 'class' in samba3rpc.c
metze
commit 900a5a6f87d37c1a8cd6bfdc7c24a8d87a83ea48
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 13:04:06 2009 +0100
s4:torture/rpc: s/class/kclass in winreg.c
metze
commit fb5346f3bbbde389295bb56de3ab97df50ddc2ee
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 13:03:36 2009 +0100
s4:torture/util_smb: s/class/classnum
metze
commit 3131ca2340dcdb43257fe9a75c749c93f6931948
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 13:03:00 2009 +0100
s4:torture/rpc: avoid 'new' in samsync.c
metze
commit 03ed70c9f3485e99b7a9574f076c98a631a358bf
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 13:01:45 2009 +0100
s4:torture/nbench: don't use 'new'
metze
commit b4af7074b789b434f083a89a70c7cf7f8e43f4d4
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 13:00:47 2009 +0100
s4:py_security: avoid 'this' and use 'py_self' and 'self'
metze
commit 0c3bc60a01a3353557abe42f6a689c54b9369e7f
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 13:00:02 2009 +0100
s4:lib/registry: s/new/nkey
metze
commit 8249a467e365d7dc5eb52fd4c1315870405debb4
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 12:59:28 2009 +0100
lib/tevent: s/private/private_data
metze
commit 21571e64a9c338b8e0be092f01a99813674b9ed1
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 12:25:14 2009 +0100
s4:rpc_server/lsa: s/delete/del s/open/opn
metze
commit aa9c6b58f52b79c644cb894cc25b41cecd79b226
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 12:15:17 2009 +0100
s4:libnet: s/new/n
metze
commit 48a0721606b789a8b5086ae41b7208e753c415c9
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 12:14:45 2009 +0100
lib/util: s/new/pn in idtree.c
metze
commit 5e6e370c4ed44e2b13d0817f3c1c1c36efb74cba
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 11:28:19 2009 +0100
lib/util: s/class/dclass
metze
commit 62a3947d53aa38a2dab5ddf163d41a58a26bff14
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 11:26:20 2009 +0100
s4:ldb_map: s/new/ntree
metze
commit 82466db35dd21064f3f3754fb9ebdedaf13566bc
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 11:25:39 2009 +0100
s4:ldif_handlers: s/class/sclass
metze
commit 73aea83966851e11923d2f5fd69171be385e22f7
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 11:25:11 2009 +0100
s4:schema_fsmo: s/class/sclass
metze
commit 44625f76c174e97e8a2c03a196358c604e78f694
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 11:24:08 2009 +0100
s4:loadparm: s/class/pclass
metze
commit 45c26648c3545804aeeddb0ca9aa5e2b6a85182b
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 11:10:15 2009 +0100
s4:update_keytab: s/delete/do_delete
metze
commit f956dddf57b35408966d58f85864c7274bce15e2
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 11:07:48 2009 +0100
libcli/nbt: s/private/private_data
metze
commit 9c387c189ebb925b22a28f74620b8773c6bf8b32
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 11:06:32 2009 +0100
s4:resolve/dns_ex: undefine class because it's used in heimdal/lib/roken/resolve.h
metze
commit 87ce6b198ac394f6f683ef125d59c1b18becbc19
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 11:00:08 2009 +0100
s4:libcli/raw: s/class/eclass
metze
commit d9c30894a1cb3d0814ba281dd6e9f5ca63c987d5
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 10:30:03 2009 +0100
s4:service_stream: s/private/private_data
metze
commit 1441e87e249190bd9fea72773b8fd014a05f9861
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 10:21:51 2009 +0100
s4:service_task: s/private/private_data
metze
commit 0ac7792e022107c352f5464f52563c4e885272dd
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 10:17:00 2009 +0100
s4:libcliraw: s/private/private_data
metze
commit e5e0a064853ff5cd7f9bea0d9a6db8a0ae497635
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 10:14:32 2009 +0100
s4:wrepl_request: s/private/private_data
metze
commit 62c8f6b1a57e3f03965358e5b6c3e55eeb7aaa8b
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 10:13:43 2009 +0100
s4:web_server: s/private/private_data
metze
commit 5bca70a0c275f545433afad624b1e54adc27986d
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 10:01:36 2009 +0100
s4:rpc_server: s/private/private_data
metze
commit 476aa1f00d298bdbefd92ba9505109167e3dfa1e
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 09:56:47 2009 +0100
s4:smb2: s/private/private_data
metze
commit e08dfe008e63789347cf7dc360b70ba1a1cb5b20
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 09:55:58 2009 +0100
s4:dgram: s/private/private_data
metze
commit 1bb0104070eb1188ed0256535907f2bed006a939
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 09:46:59 2009 +0100
s4:cldap: s/private/private_data
metze
commit 24d31c0e81c2332a610bb94acb1227fb9690443a
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 09:38:43 2009 +0100
s4:kludge_acl: s/class/sclass
metze
commit d0ad2ecdeadcfdc99ead63000d484dfba5745ac2
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 09:36:58 2009 +0100
s4:cluster: s/private/private_data
metze
commit 0fadddf8d417f34dbe964ffd20483d24bf308325
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 09:31:38 2009 +0100
s4:ldap_server: s/private/private_data
metze
commit 2dc838341dd9f44437e3782cf49bf8163ec72fd2
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 09:20:36 2009 +0100
s4:dsdb/schema: s/class/sclass
metze
commit 096b4a9bd054650f3f01be41e23b4168686ed9f2
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 09:12:52 2009 +0100
s4:libcli/smb2: s/class/info_class
metze
commit 23bec6c670073fc419908c65918d885e6d9553e2
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:50:04 2009 +0100
s4:includes.h: stdlib.h and stdbool.h are already included by replace.h
metze
commit ab7f003aad6d16103c72ec3330836340e83a230a
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:44:44 2009 +0100
s4:torture: s/private/private_data
metze
commit 35f7cee25db3f4a3db9bfa6d7a12f1d9d6698ca0
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:44:06 2009 +0100
s4:wrepl_server: s/private/private_data
metze
commit 7237d777d5fb208a7ae305090d07c11bb6e6ba34
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:43:37 2009 +0100
s4:winbind: s/private/private_data
metze
commit 100f4e318e2cf61413a70bb269efadc2c73228c8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:42:38 2009 +0100
s4:web_server: s/private/private_data
metze
commit e3dfbc9b7684e969776d3f7dbc7c4dad4108791b
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:42:16 2009 +0100
s4:ntlm_auth: s/private/private1
metze
commit 29cc638c2cfe4ab785d52c3cc61e81dfaf387b29
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:41:28 2009 +0100
s4:smbd: s/private/private_data
metze
commit 5bf95a71ddfeb6d2a77d7b4f488a4f5cf57f00f0
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:39:45 2009 +0100
s4:smb_server: s/private/private_data
metze
commit 4523a634cb1702f96cc41099d9761a073c7a6d49
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:39:09 2009 +0100
s4:rpc_server/remote: s/private/priv
metze
commit 0854950b34dedbbd03120fa359403e3451161a38
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:38:07 2009 +0100
s4:rpc_server/echo: s/private/private_data
metze
commit 5e9ee5406049a07d986da83c28c3401dccf1c08a
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:37:18 2009 +0100
s4:ntvfs/unixuid: s/private/priv
metze
commit 7bb44616443babf9fa1f755dc5eb245576b3f8c2
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:36:39 2009 +0100
s4:ntvfs/smb2: s/private/p
metze
commit 42f92109d2cd5c1ecb58b246de00bd9ede14703f
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:35:29 2009 +0100
s4:ntvfs/simple: s/private/p
metze
commit 2110ef3c5d4b2085310f706c62e6bf11299dc2eb
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:34:16 2009 +0100
s4:ntvfs/posix: s/private/private_data
metze
commit 7ee87c339bc328f89d08afc0e5c9e095ceb1f746
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:33:46 2009 +0100
s4:ntvfs/nbench: s/private/nprivates
metze
commit 8a95f4d2d6dc4ad3e0434c6f5e53b87ff3fdecb1
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:33:21 2009 +0100
s4:ntvfs/ipc: s/private/ipriv
metze
commit 33e8f4772544a457bc2adc200235e065cba3c239
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:32:46 2009 +0100
s4:ntvfs/common: s/private/private_data
metze
commit 0c64c213e84f644b39f1c654e0be9ca601173eca
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:32:04 2009 +0100
s4:ntvfs/cifs_posix_cli: s/private/p
metze
commit 24fb16f1f6d1e5ecbc1c6468bc1f35e7ecb3b0aa
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:30:38 2009 +0100
s4:ntvfs/cifs/: s/private/p
metze
commit 50ad5239fd13fcec2b18eaa2ced55fd0e1b00a65
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:29:13 2009 +0100
s4:ntvfs: s/private/private_data
metze
commit c463bc127c911dcc3177e208931819ffc2f4fadb
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:28:05 2009 +0100
s4:ntp_signd: s/private/private_data
metze
commit 74e783bf5850658124d60503d7b5d2fba8a9bb87
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:27:33 2009 +0100
s4:librpc/rpc: s/private/private_data
metze
commit c005bbddb713c25f3201d6007e6ef1114084d041
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:27:04 2009 +0100
s4:libnet/: s/private/private_data
metze
commit 58ca4d4e3184580fbd895cec80d01b01768ae378
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:26:33 2009 +0100
s4:libcli/wrepl: s/private/private_data
metze
commit 71e318cf319606828657338ad49d0ad73ba2cc19
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:26:08 2009 +0100
s4:libcli/smb2: s/private/private_data
metze
commit 1ee4bbec1a573be26360568275bd3882837dca9b
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:24:59 2009 +0100
s4:libcli/raw: s/private/private_data
metze
commit 0db079b9eb9446f63a3b1c08cd6de34faa0f6088
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:24:00 2009 +0100
s4:libcli/dgram: s/private/private_data
metze
commit 8d379008283415a9895ea9b0f9acc262f5859a8d
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:23:24 2009 +0100
s4:libcli/clilist.c: s/private/private_data
metze
commit ea7ea27f2f5d729629cf326424ea8b1123b9fc6e
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:22:40 2009 +0100
s4:libcli/cldap: s/private/private_data
metze
commit 79ae2de00135b3047dcb835c14a3afac6eb168eb
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:22:01 2009 +0100
s4:lib/stream: s/private/private_data
metze
commit 7db458a56c9296c96c65f903a75453ac635a42c8
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:21:17 2009 +0100
s4:lib/socket: s/private/private_data
metze
commit 735af62105c563f9ee2ffd8bc21e914499d5ee76
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:20:52 2009 +0100
s4:lib/messaging: s/private/private_data
metze
commit b7f298348934e86b1f8026bd445ec167439581f6
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:19:11 2009 +0100
s4:extended_dn_out: s/private/p s/new/nattrs
metze
commit 2e82a4ced2282eec55983b443e9e54f57e8b443d
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:17:20 2009 +0100
s4:auth/kerberos: s/private/private_data
metze
commit e7454d46d4cf6125e14ed7c9a36132eea929f19c
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Feb 2 08:15:46 2009 +0100
s4:auth/gensec: s/private/private_data
metze
-----------------------------------------------------------------------
Summary of changes:
lib/tevent/testsuite.c | 12 +-
lib/util/debug.c | 2 +-
lib/util/idtree.c | 32 ++--
libcli/nbt/nbtsocket.c | 12 +-
source4/auth/gensec/socket.c | 20 +-
source4/auth/kerberos/krb5_init_context.c | 20 +-
source4/cldap_server/netlogon.c | 2 +-
source4/cldap_server/rootdse.c | 2 +-
source4/cluster/cluster_private.h | 2 +-
source4/cluster/local.c | 2 +-
source4/dsdb/repl/drepl_service.c | 2 +-
source4/dsdb/samdb/ldb_modules/extended_dn_out.c | 80 ++++----
source4/dsdb/samdb/ldb_modules/kludge_acl.c | 10 +-
source4/dsdb/samdb/ldb_modules/schema_fsmo.c | 14 +-
source4/dsdb/samdb/ldb_modules/update_keytab.c | 14 +-
source4/dsdb/schema/schema_description.c | 27 ++--
source4/dsdb/schema/schema_query.c | 36 ++--
source4/include/includes.h | 18 ++-
source4/kdc/kdc.c | 8 +-
source4/ldap_server/ldap_bind.c | 4 +-
source4/ldap_server/ldap_extended.c | 4 +-
source4/ldap_server/ldap_server.c | 24 +-
source4/lib/ldb-samba/ldif_handlers.c | 8 +-
source4/lib/ldb/ldb_map/ldb_map.h | 2 +-
source4/lib/messaging/pymessaging.c | 4 +-
source4/lib/messaging/tests/messaging.c | 10 +-
source4/lib/registry/tools/regshell.c | 6 +-
source4/lib/socket/connect.c | 6 +-
source4/lib/stream/packet.c | 32 ++--
source4/lib/stream/packet.h | 16 +-
source4/libcli/cldap/cldap.c | 12 +-
source4/libcli/cldap/cldap.h | 6 +-
source4/libcli/clilist.c | 8 +-
source4/libcli/composite/composite.c | 4 +-
source4/libcli/dgram/dgramsocket.c | 8 +-
source4/libcli/dgram/libdgram.h | 10 +-
source4/libcli/dgram/mailslot.c | 8 +-
source4/libcli/raw/clioplock.c | 4 +-
source4/libcli/raw/clitransport.c | 34 ++--
source4/libcli/raw/interfaces.h | 2 +-
source4/libcli/raw/libcliraw.h | 14 +-
source4/libcli/raw/rawrequest.c | 2 +-
source4/libcli/raw/rawsearch.c | 28 ++--
source4/libcli/resolve/dns_ex.c | 5 +
source4/libcli/smb2/getinfo.c | 11 +-
source4/libcli/smb2/smb2.h | 2 +-
source4/libcli/smb2/transport.c | 28 ++--
source4/libcli/smb_composite/appendacl.c | 12 +-
source4/libcli/smb_composite/connect.c | 10 +-
source4/libcli/smb_composite/fsinfo.c | 4 +-
source4/libcli/smb_composite/loadfile.c | 10 +-
source4/libcli/smb_composite/savefile.c | 10 +-
source4/libcli/smb_composite/sesssetup.c | 2 +-
source4/libcli/wrepl/winsrepl.c | 12 +-
source4/libcli/wrepl/winsrepl.h | 2 +-
source4/libnet/libnet_become_dc.c | 4 +-
source4/libnet/libnet_samdump.c | 24 +-
source4/libnet/libnet_samdump_keytab.c | 6 +-
source4/libnet/libnet_samsync.h | 4 +-
source4/libnet/libnet_samsync_ldb.c | 8 +-
source4/libnet/libnet_unbecome_dc.c | 4 +-
source4/librpc/ndr/py_security.c | 18 +-
source4/librpc/rpc/dcerpc.c | 4 +-
source4/librpc/rpc/dcerpc_connect.c | 4 +-
source4/librpc/rpc/dcerpc_smb.c | 16 +-
source4/librpc/rpc/dcerpc_sock.c | 14 +-
source4/nbt_server/dgram/netlogon.c | 2 +-
source4/nbt_server/dgram/ntlogon.c | 2 +-
source4/nbt_server/irpc.c | 2 +-
source4/ntp_signd/ntp_signd.c | 16 +-
source4/ntvfs/cifs/vfs_cifs.c | 240 +++++++++++-----------
source4/ntvfs/cifs_posix_cli/svfs_util.c | 12 +-
source4/ntvfs/cifs_posix_cli/vfs_cifs_posix.c | 92 ++++----
source4/ntvfs/common/opendb.c | 8 +-
source4/ntvfs/common/opendb.h | 4 +-
source4/ntvfs/common/opendb_tdb.c | 8 +-
source4/ntvfs/ipc/vfs_ipc.c | 88 ++++----
source4/ntvfs/nbench/vfs_nbench.c | 8 +-
source4/ntvfs/ntvfs.h | 10 +-
source4/ntvfs/ntvfs_interface.c | 32 ++--
source4/ntvfs/posix/pvfs_aio.c | 8 +-
source4/ntvfs/posix/pvfs_lock.c | 4 +-
source4/ntvfs/posix/pvfs_notify.c | 8 +-
source4/ntvfs/simple/svfs_util.c | 12 +-
source4/ntvfs/simple/vfs_simple.c | 92 ++++----
source4/ntvfs/smb2/vfs_smb2.c | 78 ++++----
source4/ntvfs/unixuid/vfs_unixuid.c | 46 ++--
source4/param/loadparm.c | 18 +-
source4/param/loadparm.h | 2 +-
source4/param/pyparam.c | 2 +-
source4/rpc_server/dcerpc_server.c | 4 +-
source4/rpc_server/dcerpc_server.h | 4 +-
source4/rpc_server/echo/rpc_echo.c | 4 +-
source4/rpc_server/lsa/dcesrv_lsa.c | 62 +++---
source4/rpc_server/netlogon/dcerpc_netlogon.c | 8 +-
source4/rpc_server/remote/dcesrv_remote.c | 44 ++--
source4/rpc_server/service_rpc.c | 8 +-
source4/rpc_server/spoolss/dcesrv_spoolss.c | 14 +-
source4/rpc_server/unixinfo/dcesrv_unixinfo.c | 10 +-
source4/rpc_server/winreg/rpc_winreg.c | 4 +-
source4/smb_server/smb/receive.c | 4 +-
source4/smb_server/smb/search.c | 4 +-
source4/smb_server/smb/trans2.c | 4 +-
source4/smb_server/smb2/find.c | 4 +-
source4/smb_server/smb2/receive.c | 4 +-
source4/smb_server/smb_server.c | 14 +-
source4/smbd/process_prefork.c | 12 +-
source4/smbd/process_single.c | 10 +-
source4/smbd/process_standard.c | 14 +-
source4/smbd/process_thread.c | 16 +-
source4/smbd/server.c | 8 +-
source4/smbd/service_named_pipe.c | 14 +-
source4/smbd/service_stream.c | 26 ++--
source4/smbd/service_stream.h | 2 +-
source4/smbd/service_task.c | 4 +-
source4/smbd/service_task.h | 2 +-
source4/torture/basic/misc.c | 14 +-
source4/torture/gentest.c | 14 +-
source4/torture/ldap/cldapbench.c | 4 +-
source4/torture/nbench/nbio.c | 12 +-
source4/torture/nbt/dgram.c | 48 +++---
source4/torture/raw/lockbench.c | 8 +-
source4/torture/raw/offline.c | 12 +-
source4/torture/raw/openbench.c | 14 +-
source4/torture/raw/oplock.c | 22 +-
source4/torture/raw/search.c | 8 +-
source4/torture/rpc/samba3rpc.c | 12 +-
source4/torture/rpc/samsync.c | 44 ++--
source4/torture/rpc/winreg.c | 20 +-
source4/torture/unix/unix_info2.c | 4 +-
source4/torture/util_smb.c | 6 +-
source4/utils/ntlm_auth.c | 32 ++--
source4/web_server/web_server.c | 18 +-
source4/web_server/web_server.h | 2 +-
source4/web_server/wsgi.c | 4 +-
source4/winbind/wb_samba3_protocol.c | 6 +-
source4/winbind/wb_server.c | 12 +-
source4/wrepl_server/wrepl_in_connection.c | 16 +-
source4/wrepl_server/wrepl_out_helpers.c | 20 +-
source4/wrepl_server/wrepl_server.c | 2 +-
140 files changed, 1130 insertions(+), 1107 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c
index 1b811f5..faa1857 100644
--- a/lib/tevent/testsuite.c
+++ b/lib/tevent/testsuite.c
@@ -27,9 +27,9 @@
static int fde_count;
static void fde_handler(struct tevent_context *ev_ctx, struct tevent_fd *f,
- uint16_t flags, void *private)
+ uint16_t flags, void *private_data)
{
- int *fd = (int *)private;
+ int *fd = (int *)private_data;
char c;
#ifdef SA_SIGINFO
kill(getpid(), SIGUSR1);
@@ -41,16 +41,16 @@ static void fde_handler(struct tevent_context *ev_ctx, struct tevent_fd *f,
}
static void finished_handler(struct tevent_context *ev_ctx, struct tevent_timer *te,
- struct timeval tval, void *private)
+ struct timeval tval, void *private_data)
{
- int *finished = (int *)private;
+ int *finished = (int *)private_data;
(*finished) = 1;
}
static void count_handler(struct tevent_context *ev_ctx, struct signal_event *te,
- int signum, int count, void *info, void *private)
+ int signum, int count, void *info, void *private_data)
{
- int *countp = (int *)private;
+ int *countp = (int *)private_data;
(*countp) += count;
}
diff --git a/lib/util/debug.c b/lib/util/debug.c
index 98aabc5..5788220 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -102,7 +102,7 @@ _PUBLIC_ void dbghdr(int level, const char *location, const char *func)
}
-_PUBLIC_ void dbghdrclass(int level, int class, const char *location, const char *func)
+_PUBLIC_ void dbghdrclass(int level, int dclass, const char *location, const char *func)
{
/* Simple wrapper, Samba 4 doesn't do debug classes */
dbghdr(level, location, func);
diff --git a/lib/util/idtree.c b/lib/util/idtree.c
index 1939229..c8a8b63 100644
--- a/lib/util/idtree.c
+++ b/lib/util/idtree.c
@@ -92,10 +92,10 @@ static void free_layer(struct idr_context *idp, struct idr_layer *p)
static int idr_pre_get(struct idr_context *idp)
{
while (idp->id_free_cnt < IDR_FREE_MAX) {
- struct idr_layer *new = talloc_zero(idp, struct idr_layer);
- if(new == NULL)
+ struct idr_layer *pn = talloc_zero(idp, struct idr_layer);
+ if(pn == NULL)
return (0);
- free_layer(idp, new);
+ free_layer(idp, pn);
}
return 1;
}
@@ -103,7 +103,7 @@ static int idr_pre_get(struct idr_context *idp)
static int sub_alloc(struct idr_context *idp, void *ptr, int *starting_id)
{
int n, m, sh;
- struct idr_layer *p, *new;
+ struct idr_layer *p, *pn;
struct idr_layer *pa[MAX_LEVEL];
int l, id, oid;
uint32_t bm;
@@ -155,9 +155,9 @@ restart:
* Create the layer below if it is missing.
*/
if (!p->ary[m]) {
- if (!(new = alloc_layer(idp)))
+ if (!(pn = alloc_layer(idp)))
return -1;
- p->ary[m] = new;
+ p->ary[m] = pn;
p->count++;
}
pa[l--] = p;
@@ -188,7 +188,7 @@ restart:
static int idr_get_new_above_int(struct idr_context *idp, void *ptr, int starting_id)
{
- struct idr_layer *p, *new;
+ struct idr_layer *p, *pn;
int layers, v, id;
idr_pre_get(idp);
@@ -210,24 +210,24 @@ build_up:
layers++;
if (!p->count)
continue;
- if (!(new = alloc_layer(idp))) {
+ if (!(pn = alloc_layer(idp))) {
/*
* The allocation failed. If we built part of
* the structure tear it down.
*/
- for (new = p; p && p != idp->top; new = p) {
+ for (pn = p; p && p != idp->top; pn = p) {
p = p->ary[0];
- new->ary[0] = NULL;
- new->bitmap = new->count = 0;
- free_layer(idp, new);
+ pn->ary[0] = NULL;
+ pn->bitmap = pn->count = 0;
+ free_layer(idp, pn);
}
return -1;
}
- new->ary[0] = p;
- new->count = 1;
+ pn->ary[0] = p;
+ pn->count = 1;
if (p->bitmap == IDR_FULL)
- set_bit(0, new->bitmap);
- p = new;
+ set_bit(0, pn->bitmap);
+ p = pn;
}
idp->top = p;
idp->layers = layers;
diff --git a/libcli/nbt/nbtsocket.c b/libcli/nbt/nbtsocket.c
index dac61ef..a3e295d 100644
--- a/libcli/nbt/nbtsocket.c
+++ b/libcli/nbt/nbtsocket.c
@@ -115,9 +115,9 @@ failed:
handle a request timeout
*/
static void nbt_name_socket_timeout(struct tevent_context *ev, struct tevent_timer *te,
- struct timeval t, void *private)
+ struct timeval t, void *private_data)
{
- struct nbt_name_request *req = talloc_get_type(private,
+ struct nbt_name_request *req = talloc_get_type(private_data,
struct nbt_name_request);
if (req->num_retries != 0) {
@@ -314,9 +314,9 @@ done:
handle fd events on a nbt_name_socket
*/
static void nbt_name_socket_handler(struct tevent_context *ev, struct tevent_fd *fde,
- uint16_t flags, void *private)
+ uint16_t flags, void *private_data)
{
- struct nbt_name_socket *nbtsock = talloc_get_type(private,
+ struct nbt_name_socket *nbtsock = talloc_get_type(private_data,
struct nbt_name_socket);
if (flags & EVENT_FD_WRITE) {
nbt_name_socket_send(nbtsock);
@@ -508,10 +508,10 @@ NTSTATUS nbt_name_request_recv(struct nbt_name_request *req)
_PUBLIC_ NTSTATUS nbt_set_incoming_handler(struct nbt_name_socket *nbtsock,
void (*handler)(struct nbt_name_socket *, struct nbt_name_packet *,
struct socket_address *),
- void *private)
+ void *private_data)
{
nbtsock->incoming.handler = handler;
- nbtsock->incoming.private_data = private;
+ nbtsock->incoming.private_data = private_data;
EVENT_FD_READABLE(nbtsock->fde);
return NT_STATUS_OK;
}
diff --git a/source4/auth/gensec/socket.c b/source4/auth/gensec/socket.c
index a338797..6a03f0b 100644
--- a/source4/auth/gensec/socket.c
+++ b/source4/auth/gensec/socket.c
@@ -158,9 +158,9 @@ NTSTATUS gensec_packet_full_request(struct gensec_security *gensec_security,
return packet_full_request_u32(NULL, blob, size);
}
-static NTSTATUS gensec_socket_full_request(void *private, DATA_BLOB blob, size_t *size)
+static NTSTATUS gensec_socket_full_request(void *private_data, DATA_BLOB blob, size_t *size)
{
- struct gensec_socket *gensec_socket = talloc_get_type(private, struct gensec_socket);
+ struct gensec_socket *gensec_socket = talloc_get_type(private_data, struct gensec_socket);
struct gensec_security *gensec_security = gensec_socket->gensec_security;
return gensec_packet_full_request(gensec_security, blob, size);
}
@@ -187,9 +187,9 @@ static NTSTATUS gensec_socket_pending(struct socket_context *sock, size_t *npend
}
/* Note if an error occours, so we can return it up the stack */
-static void gensec_socket_error_handler(void *private, NTSTATUS status)
+static void gensec_socket_error_handler(void *private_data, NTSTATUS status)
{
- struct gensec_socket *gensec_socket = talloc_get_type(private, struct gensec_socket);
+ struct gensec_socket *gensec_socket = talloc_get_type(private_data, struct gensec_socket);
if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
gensec_socket->eof = true;
} else {
@@ -199,9 +199,9 @@ static void gensec_socket_error_handler(void *private, NTSTATUS status)
static void gensec_socket_trigger_read(struct tevent_context *ev,
struct tevent_timer *te,
- struct timeval t, void *private)
+ struct timeval t, void *private_data)
{
- struct gensec_socket *gensec_socket = talloc_get_type(private, struct gensec_socket);
+ struct gensec_socket *gensec_socket = talloc_get_type(private_data, struct gensec_socket);
gensec_socket->in_extra_read++;
gensec_socket->recv_handler(gensec_socket->recv_private, EVENT_FD_READ);
@@ -287,9 +287,9 @@ static NTSTATUS gensec_socket_recv(struct socket_context *sock, void *buf,
*
* This function (and anything under it) MUST NOT call the event system
*/
-static NTSTATUS gensec_socket_unwrap(void *private, DATA_BLOB blob)
+static NTSTATUS gensec_socket_unwrap(void *private_data, DATA_BLOB blob)
{
- struct gensec_socket *gensec_socket = talloc_get_type(private, struct gensec_socket);
+ struct gensec_socket *gensec_socket = talloc_get_type(private_data, struct gensec_socket);
DATA_BLOB unwrapped;
NTSTATUS nt_status;
TALLOC_CTX *mem_ctx;
@@ -329,9 +329,9 @@ static NTSTATUS gensec_socket_unwrap(void *private, DATA_BLOB blob)
}
/* when the data is sent, we know we have not been interrupted */
-static void send_callback(void *private)
+static void send_callback(void *private_data)
{
- struct gensec_socket *gensec_socket = talloc_get_type(private, struct gensec_socket);
+ struct gensec_socket *gensec_socket = talloc_get_type(private_data, struct gensec_socket);
gensec_socket->interrupted = false;
}
diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c
index 6e88584..04f0718 100644
--- a/source4/auth/kerberos/krb5_init_context.c
+++ b/source4/auth/kerberos/krb5_init_context.c
@@ -65,11 +65,11 @@ static krb5_error_code smb_krb5_context_destroy_2(struct smb_krb5_context *ctx)
}
/* We never close down the DEBUG system, and no need to unreference the use */
-static void smb_krb5_debug_close(void *private) {
+static void smb_krb5_debug_close(void *private_data) {
return;
}
-static void smb_krb5_debug_wrapper(const char *timestr, const char *msg, void *private)
+static void smb_krb5_debug_wrapper(const char *timestr, const char *msg, void *private_data)
{
DEBUG(2, ("Kerberos: %s\n", msg));
}
@@ -117,9 +117,9 @@ static void smb_krb5_socket_recv(struct smb_krb5_socket *smb_krb5)
talloc_free(tmp_ctx);
}
-static NTSTATUS smb_krb5_full_packet(void *private, DATA_BLOB data)
+static NTSTATUS smb_krb5_full_packet(void *private_data, DATA_BLOB data)
{
- struct smb_krb5_socket *smb_krb5 = talloc_get_type(private, struct smb_krb5_socket);
+ struct smb_krb5_socket *smb_krb5 = talloc_get_type(private_data, struct smb_krb5_socket);
talloc_steal(smb_krb5, data.data);
smb_krb5->reply = data;
smb_krb5->reply.length -= 4;
@@ -132,16 +132,16 @@ static NTSTATUS smb_krb5_full_packet(void *private, DATA_BLOB data)
*/
static void smb_krb5_request_timeout(struct tevent_context *event_ctx,
struct tevent_timer *te, struct timeval t,
- void *private)
+ void *private_data)
{
- struct smb_krb5_socket *smb_krb5 = talloc_get_type(private, struct smb_krb5_socket);
+ struct smb_krb5_socket *smb_krb5 = talloc_get_type(private_data, struct smb_krb5_socket);
DEBUG(5,("Timed out smb_krb5 packet\n"));
smb_krb5->status = NT_STATUS_IO_TIMEOUT;
}
-static void smb_krb5_error_handler(void *private, NTSTATUS status)
+static void smb_krb5_error_handler(void *private_data, NTSTATUS status)
{
- struct smb_krb5_socket *smb_krb5 = talloc_get_type(private, struct smb_krb5_socket);
+ struct smb_krb5_socket *smb_krb5 = talloc_get_type(private_data, struct smb_krb5_socket);
smb_krb5->status = status;
}
@@ -170,9 +170,9 @@ static void smb_krb5_socket_send(struct smb_krb5_socket *smb_krb5)
handle fd events on a smb_krb5_socket
*/
static void smb_krb5_socket_handler(struct tevent_context *ev, struct tevent_fd *fde,
- uint16_t flags, void *private)
+ uint16_t flags, void *private_data)
{
- struct smb_krb5_socket *smb_krb5 = talloc_get_type(private, struct smb_krb5_socket);
+ struct smb_krb5_socket *smb_krb5 = talloc_get_type(private_data, struct smb_krb5_socket);
switch (smb_krb5->hi->proto) {
case KRB5_KRBHST_UDP:
if (flags & TEVENT_FD_READ) {
diff --git a/source4/cldap_server/netlogon.c b/source4/cldap_server/netlogon.c
index 3c12954..0df35be 100644
--- a/source4/cldap_server/netlogon.c
+++ b/source4/cldap_server/netlogon.c
@@ -407,7 +407,7 @@ void cldapd_netlogon_request(struct cldap_socket *cldap,
struct ldb_parse_tree *tree,
struct socket_address *src)
{
- struct cldapd_server *cldapd = talloc_get_type(cldap->incoming.private, struct cldapd_server);
+ struct cldapd_server *cldapd = talloc_get_type(cldap->incoming.private_data, struct cldapd_server);
int i;
const char *domain = NULL;
const char *host = NULL;
diff --git a/source4/cldap_server/rootdse.c b/source4/cldap_server/rootdse.c
index 65786e6..daa5060 100644
--- a/source4/cldap_server/rootdse.c
+++ b/source4/cldap_server/rootdse.c
@@ -155,7 +155,7 @@ void cldapd_rootdse_request(struct cldap_socket *cldap,
struct ldap_SearchRequest *search,
struct socket_address *src)
{
- struct cldapd_server *cldapd = talloc_get_type(cldap->incoming.private, struct cldapd_server);
+ struct cldapd_server *cldapd = talloc_get_type(cldap->incoming.private_data, struct cldapd_server);
NTSTATUS status;
struct cldap_reply reply;
struct ldap_Result result;
diff --git a/source4/cluster/cluster_private.h b/source4/cluster/cluster_private.h
index 79394b4..e57c983 100644
--- a/source4/cluster/cluster_private.h
+++ b/source4/cluster/cluster_private.h
@@ -36,7 +36,7 @@ struct cluster_ops {
cluster_message_fn_t handler);
NTSTATUS (*message_send)(struct cluster_ops *ops,
struct server_id server, DATA_BLOB *data);
- void *private; /* backend state */
+ void *private_data; /* backend state */
};
void cluster_set_ops(struct cluster_ops *new_ops);
diff --git a/source4/cluster/local.c b/source4/cluster/local.c
index f36a06c..96d1d53 100644
--- a/source4/cluster/local.c
+++ b/source4/cluster/local.c
@@ -103,7 +103,7 @@ static struct cluster_ops cluster_local_ops = {
.backend_handle = local_backend_handle,
.message_init = local_message_init,
.message_send = local_message_send,
- .private = NULL
+ .private_data = NULL
};
void cluster_local_init(void)
diff --git a/source4/dsdb/repl/drepl_service.c b/source4/dsdb/repl/drepl_service.c
index 98d1c1b..152bbec 100644
--- a/source4/dsdb/repl/drepl_service.c
+++ b/source4/dsdb/repl/drepl_service.c
@@ -140,7 +140,7 @@ static void dreplsrv_task_init(struct task_server *task)
}
service->task = task;
service->startup_time = timeval_current();
- task->private = service;
+ task->private_data = service;
status = dreplsrv_init_creds(service);
if (!W_ERROR_IS_OK(status)) {
diff --git a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
index 058c51b..f8526fa 100644
--- a/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
+++ b/source4/dsdb/samdb/ldb_modules/extended_dn_out.c
@@ -59,42 +59,42 @@ static bool is_attr_in_list(const char * const * attrs, const char *attr)
static char **copy_attrs(void *mem_ctx, const char * const * attrs)
{
- char **new;
+ char **nattrs;
int i, num;
for (num = 0; attrs[num]; num++);
- new = talloc_array(mem_ctx, char *, num + 1);
- if (!new) return NULL;
+ nattrs = talloc_array(mem_ctx, char *, num + 1);
+ if (!nattrs) return NULL;
for(i = 0; i < num; i++) {
- new[i] = talloc_strdup(new, attrs[i]);
- if (!new[i]) {
- talloc_free(new);
+ nattrs[i] = talloc_strdup(nattrs, attrs[i]);
+ if (!nattrs[i]) {
+ talloc_free(nattrs);
return NULL;
}
}
- new[i] = NULL;
+ nattrs[i] = NULL;
- return new;
+ return nattrs;
}
static bool add_attrs(void *mem_ctx, char ***attrs, const char *attr)
{
- char **new;
+ char **nattrs;
int num;
for (num = 0; (*attrs)[num]; num++);
- new = talloc_realloc(mem_ctx, *attrs, char *, num + 2);
- if (!new) return false;
+ nattrs = talloc_realloc(mem_ctx, *attrs, char *, num + 2);
+ if (!nattrs) return false;
- *attrs = new;
+ *attrs = nattrs;
- new[num] = talloc_strdup(new, attr);
- if (!new[num]) return false;
+ nattrs[num] = talloc_strdup(nattrs, attr);
+ if (!nattrs[num]) return false;
- new[num + 1] = NULL;
+ nattrs[num + 1] = NULL;
return true;
}
@@ -246,10 +246,10 @@ static int extended_callback(struct ldb_request *req, struct ldb_reply *ares)
struct dsdb_openldap_dereference_result_control *dereference_control = NULL;
int ret, i, j;
struct ldb_message *msg = ares->message;
- struct extended_dn_out_private *private;
+ struct extended_dn_out_private *p;
ac = talloc_get_type(req->context, struct extended_search_context);
- private = talloc_get_type(ac->module->private_data, struct extended_dn_out_private);
+ p = talloc_get_type(ac->module->private_data, struct extended_dn_out_private);
if (!ares) {
return ldb_module_done(ac->req, NULL, NULL,
@@ -271,7 +271,7 @@ static int extended_callback(struct ldb_request *req, struct ldb_reply *ares)
break;
}
- if (private && private->normalise) {
+ if (p && p->normalise) {
ret = fix_dn(ares->message->dn);
if (ret != LDB_SUCCESS) {
return ldb_module_done(ac->req, NULL, NULL, ret);
@@ -289,7 +289,7 @@ static int extended_callback(struct ldb_request *req, struct ldb_reply *ares)
}
}
- if ((private && private->normalise) || ac->inject) {
+ if ((p && p->normalise) || ac->inject) {
const struct ldb_val *val = ldb_msg_find_ldb_val(ares->message, "distinguishedName");
if (val) {
ldb_msg_remove_attr(ares->message, "distinguishedName");
@@ -307,7 +307,7 @@ static int extended_callback(struct ldb_request *req, struct ldb_reply *ares)
}
}
- if (private && private->dereference) {
+ if (p && p->dereference) {
control = ldb_reply_get_control(ares, DSDB_OPENLDAP_DEREFERENCE_CONTROL);
if (control && control->data) {
@@ -323,7 +323,7 @@ static int extended_callback(struct ldb_request *req, struct ldb_reply *ares)
continue;
}
- if (private->normalise) {
+ if (p->normalise) {
/* If we are also in 'normalise' mode, then
* fix the attribute names to be in the
* correct case */
@@ -351,7 +351,7 @@ static int extended_callback(struct ldb_request *req, struct ldb_reply *ares)
return ldb_module_done(ac->req, NULL, NULL, LDB_ERR_INVALID_DN_SYNTAX);
}
- if (private->normalise) {
+ if (p->normalise) {
ret = fix_dn(dn);
if (ret != LDB_SUCCESS) {
return ldb_module_done(ac->req, NULL, NULL, ret);
@@ -408,7 +408,7 @@ static int extended_dn_out_search(struct ldb_module *module, struct ldb_request
const char * const *const_attrs;
int ret;
- struct extended_dn_out_private *private = talloc_get_type(module->private_data, struct extended_dn_out_private);
+ struct extended_dn_out_private *p = talloc_get_type(module->private_data, struct extended_dn_out_private);
/* check if there's an extended dn control */
control = ldb_request_get_control(req, LDB_CONTROL_EXTENDED_DN_OID);
@@ -450,7 +450,7 @@ static int extended_dn_out_search(struct ldb_module *module, struct ldb_request
* the extended DN, or we are 'store DN+GUID+SID'
* (!dereference) mode. (This is the normal mode for LDB on
* tdb). */
- if (control || (storage_format_control && private && !private->dereference)) {
+ if (control || (storage_format_control && p && !p->dereference)) {
--
Samba Shared Repository
More information about the samba-cvs
mailing list