[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-1329-g5757d8d
Stefan Metzmacher
metze at samba.org
Tue Mar 18 15:43:37 GMT 2008
The branch, v4-0-test has been updated
via 5757d8dfe9e6cf7b662acdf5c3d825f0021822c0 (commit)
via effda48a2670325fed56e158539417c6f95381b8 (commit)
via 8f58d39c0c621e9da85308d721a146352cc4939e (commit)
from 98ee8c84300757d778733a458c6ca3e6022b40ea (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 5757d8dfe9e6cf7b662acdf5c3d825f0021822c0
Author: Gerald W. Carter <jerry at samba.org>
Date: Thu Feb 28 11:58:05 2008 -0600
Fix macro name (no 's' in ifr_addr).
Interface detection on Solaris still failing due to items pointed out here:
http://lists.samba.org/archive/samba-technical/2007-November/056701.html
(cherry picked from commit 37c87acc9d48c1fb5d4806374ca8e992300db1ff)
commit effda48a2670325fed56e158539417c6f95381b8
Author: Volker Lendecke <vl at samba.org>
Date: Sat Mar 15 22:27:05 2008 +0100
Fix Coverity ID 554
(cherry picked from commit 471b1b0c58bc2def5d2fe9d98401def34724d447)
commit 8f58d39c0c621e9da85308d721a146352cc4939e
Author: Volker Lendecke <vl at samba.org>
Date: Sat Feb 23 10:42:43 2008 +0100
Check the return value of fgets
(cherry picked from commit b8aaa9a69fd6217ce0387ef8e84f316706186d70)
-----------------------------------------------------------------------
Summary of changes:
source/lib/replace/getpass.c | 8 +++++++-
source/lib/replace/system/network.h | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/replace/getpass.c b/source/lib/replace/getpass.c
index d91d029..73333b9 100644
--- a/source/lib/replace/getpass.c
+++ b/source/lib/replace/getpass.c
@@ -185,7 +185,13 @@ char *rep_getpass(const char *prompt)
buf[0] = 0;
if (!gotintr) {
in_fd = fileno(in);
- fgets(buf, bufsize, in);
+ if (fgets(buf, bufsize, in) == NULL) {
+ buf[0] = 0;
+ if (in && in != stdin) {
+ fclose(in);
+ }
+ return buf;
+ }
}
nread = strlen(buf);
if (nread) {
diff --git a/source/lib/replace/system/network.h b/source/lib/replace/system/network.h
index 7c23773..f943a7f 100644
--- a/source/lib/replace/system/network.h
+++ b/source/lib/replace/system/network.h
@@ -310,7 +310,7 @@ struct addrinfo {
/* Needed for some systems that don't define it (Solaris). */
#ifndef ifr_netmask
-#define ifr_netmask ifr_addrs
+#define ifr_netmask ifr_addr
#endif
#ifdef SOCKET_WRAPPER
--
Samba Shared Repository
More information about the samba-cvs
mailing list