summaryrefslogtreecommitdiffstats
path: root/source4/smbd/server.c
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-03-26 15:31:02 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-03-26 15:31:02 +0100
commit1e200c1952adab450909ac35252be4636c3e1053 (patch)
tree575e1337aaec5cf8decb10567a4876c1650441c6 /source4/smbd/server.c
parentca202cf464aec82e63be4b2160f394f56b8c195e (diff)
parent853f9283fb8fbcd2078e3cf8e99d6c8e24d77346 (diff)
downloadsamba-1e200c1952adab450909ac35252be4636c3e1053.tar.gz
samba-1e200c1952adab450909ac35252be4636c3e1053.tar.xz
samba-1e200c1952adab450909ac35252be4636c3e1053.zip
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source4/smbd/server.c')
-rw-r--r--source4/smbd/server.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index d576782ab1f..635e84fafec 100644
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -365,5 +365,5 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[
int main(int argc, const char *argv[])
{
- return binary_smbd_main("smbd", argc, argv);
+ return binary_smbd_main("samba", argc, argv);
}