summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb/ldb_modules/samldb.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-04-17 15:21:08 +0200
committerAndrew Tridgell <tridge@samba.org>2008-04-17 15:21:08 +0200
commitdc74e0fad683cb0ef9ee5996aedadd4c377a0f00 (patch)
treee33375abeb4ec70f646e420adfe9221e1bb87a2d /source4/dsdb/samdb/ldb_modules/samldb.c
parent11703b298685c9984a6a3c3a64eddb8a1a516b90 (diff)
parentef457187b4372f039f84fbb4f6e4f0fcffd67b5b (diff)
downloadsamba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.tar.gz
samba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.tar.bz2
samba-dc74e0fad683cb0ef9ee5996aedadd4c377a0f00.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 3ab9abf40605a4a6b220faeebaef81546a8d87a0)
Diffstat (limited to 'source4/dsdb/samdb/ldb_modules/samldb.c')
-rw-r--r--source4/dsdb/samdb/ldb_modules/samldb.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/samldb.c b/source4/dsdb/samdb/ldb_modules/samldb.c
index 3b67ca19d3..88590f306b 100644
--- a/source4/dsdb/samdb/ldb_modules/samldb.c
+++ b/source4/dsdb/samdb/ldb_modules/samldb.c
@@ -484,8 +484,7 @@ static int samldb_fill_group_object(struct ldb_module *module, const struct ldb_
return ret;
}
-static int samldb_fill_user_or_computer_object(struct ldb_module *module, const struct ldb_message *msg,
- struct ldb_message **ret_msg)
+static int samldb_fill_user_or_computer_object(struct ldb_module *module, const struct ldb_message *msg, struct ldb_message **ret_msg)
{
int ret;
char *name;