From: Jonas Gorski <jogo@openwrt.org>
Date: Sat, 16 Feb 2013 11:39:42 +0000 (+0000)
Subject: samba36: fix segmentation fault when trying to add non-existent users
X-Git-Tag: reboot~11257
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=c98b12d911e49827887c2165850cc3bfd19b41e5;p=openwrt%2Fstaging%2Fjogo.git

samba36: fix segmentation fault when trying to add non-existent users

Based on a patch from НКВД. Closes #12962.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 35610
---

diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile
index f71d9092d9..2842c982bf 100644
--- a/package/network/services/samba36/Makefile
+++ b/package/network/services/samba36/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=samba
 PKG_VERSION:=3.6.11
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=http://ftp.samba.org/pub/samba \
 	http://ftp.samba.org/pub/samba/old-versions
diff --git a/package/network/services/samba36/patches/111-owrt_smbpasswd.patch b/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
index 25a9cb9bf0..7d852c4c61 100644
--- a/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
+++ b/package/network/services/samba36/patches/111-owrt_smbpasswd.patch
@@ -113,7 +113,7 @@
 +	}
 +
 +	if (!find_passwd_line(fp, user, &p1)) {
-+		printf("User %s not found or invalid in /etc/passwd\n");
++		printf("User %s not found or invalid in /etc/passwd\n", user);
 +		goto out;
 +	}
 +