summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorVolker Lendecke <Volker.Lendecke@SerNet.DE>2007-10-27 21:15:07 +0200
committerJeremy Allison <jra@samba.org>2007-10-27 12:50:36 -0700
commita97b33baad5bbce7e8004346aa3a812ec4f91f0e (patch)
tree50d0a92b80dc743256d4c0a88ad494c55acf333e /source3/lib
parentacc95a43a1a8079dc41aa1dd882bdf7dd25a6cf2 (diff)
downloadsamba-a97b33baad5bbce7e8004346aa3a812ec4f91f0e.tar.gz
samba-a97b33baad5bbce7e8004346aa3a812ec4f91f0e.tar.bz2
samba-a97b33baad5bbce7e8004346aa3a812ec4f91f0e.zip
Two patches
Hi! Can you check and push them? Thanks, Volker From b488af5905e2dee12a1a72a3b40801ae5c26f24f Mon Sep 17 00:00:00 2001 From: Volker Lendecke <vl@sernet.de> Date: Sat, 27 Oct 2007 14:20:09 +0200 Subject: [PATCH] Fix some warnings and errors (This used to be commit e17d3e10e860c96b6d5208e5fe51e43b8e58c174)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/interfaces.c4
-rw-r--r--source3/lib/replace/getpass.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/lib/interfaces.c b/source3/lib/interfaces.c
index 48fe249034..38abb9299b 100644
--- a/source3/lib/interfaces.c
+++ b/source3/lib/interfaces.c
@@ -140,7 +140,7 @@ bool make_netmask(struct sockaddr_storage *pss_out,
static void make_bcast_or_net(struct sockaddr_storage *pss_out,
const struct sockaddr_storage *pss_in,
const struct sockaddr_storage *nmask,
- bool make_bcast)
+ bool make_bcast_p)
{
unsigned int i = 0, len = 0;
char *pmask = NULL;
@@ -162,7 +162,7 @@ static void make_bcast_or_net(struct sockaddr_storage *pss_out,
}
for (i = 0; i < len; i++, p++, pmask++) {
- if (make_bcast) {
+ if (make_bcast_p) {
*p = (*p & *pmask) | (*pmask ^ 0xff);
} else {
/* make_net */
diff --git a/source3/lib/replace/getpass.c b/source3/lib/replace/getpass.c
index 1d13461573..d91d029f6a 100644
--- a/source3/lib/replace/getpass.c
+++ b/source3/lib/replace/getpass.c
@@ -21,6 +21,7 @@ not, see <http://www.gnu.org/licenses/>. */
#include "system/filesys.h"
#include "system/wait.h"
#include "system/terminal.h"
+#include "system/passwd.h"
/*
* Define additional missing types