Build status as of Sat Mar 15 00:00:02 2008
URL: http://build.samba.org/ --- /home/build/master/cache/broken_results.txt.old 2008-03-14 00:00:47.0 + +++ /home/build/master/cache/broken_results.txt 2008-03-15 00:00:31.0 + @@ -1,4 +1,4 @@ -Build status as of Fri Mar 14 00:00:02 2008 +Build status as of Sat Mar 15 00:00:02 2008 Build counts: Tree Total Broken Panic @@ -8,15 +8,15 @@ distcc 1 0 0 ldb 30 30 0 libreplace 29 9 0 -lorikeet-heimdal 23 20 0 +lorikeet-heimdal 23 19 0 pidl 17 4 0 ppp 10 0 0 rsync30 13 0 samba-docs 0 0 0 samba-gtk4 4 0 samba_3_2_test 29 25 0 -samba_4_0_test 27 26 0 -smb-build28 3 0 +samba_4_0_test 27 24 0 +smb-build27 3 0 talloc 30 8 0 -tdb 30 15 0 +tdb 30 14 0
Re: [SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1292-gdb3b5f1
On Thu, 2008-03-13 at 20:36 -0500, Andrew Bartlett wrote: > - "(&(objectSid=%s)(objectclass=domain))", > + > "(&(objectSid=%s)(|(|(objectClass=domain)(objectClass=builtinDomain))(objectClass=samba4LocalDomain)))", > What is samba4LocalDomain ?? Simo. -- Simo Sorce Samba Team GPL Compliance Officer <[EMAIL PROTECTED]> Senior Software Engineer at Red Hat Inc. <[EMAIL PROTECTED]>
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-245-gf18a805
The branch, v3-2-test has been updated
via f18a80575921a241c7243c5af5a0101a2956ff17 (commit)
from 1dd8fa9a521046f1de8173ac00224706c5249665 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit f18a80575921a241c7243c5af5a0101a2956ff17
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Fri Mar 14 22:22:30 2008 +0100
Fix bug 5317
Thanks to [EMAIL PROTECTED]
---
Summary of changes:
source/auth/auth_domain.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/auth/auth_domain.c b/source/auth/auth_domain.c
index 2647408..c9aa064 100644
--- a/source/auth/auth_domain.c
+++ b/source/auth/auth_domain.c
@@ -255,7 +255,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
DEBUG(0,("domain_client_validate: unable to validate password "
"for user %s in domain %s to Domain controller %s. "
"Error was %s.\n", user_info->smb_name,
- user_info->domain, dc_name,
+ user_info->client_domain, dc_name,
nt_errstr(nt_status)));
/* map to something more useful */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-7-gb7c76d3
The branch, v3-0-test has been updated
via b7c76d3a7db82a82944b9964f1d8eaf071cab7e8 (commit)
from 3100119b97064135b4c696227349dd174d5663bf (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit b7c76d3a7db82a82944b9964f1d8eaf071cab7e8
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Fri Mar 14 22:22:30 2008 +0100
Fix bug 5317
Thanks to [EMAIL PROTECTED]
---
Summary of changes:
source/auth/auth_domain.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/auth/auth_domain.c b/source/auth/auth_domain.c
index 115c57f..24b651c 100644
--- a/source/auth/auth_domain.c
+++ b/source/auth/auth_domain.c
@@ -256,7 +256,7 @@ static NTSTATUS domain_client_validate(TALLOC_CTX *mem_ctx,
DEBUG(0,("domain_client_validate: unable to validate password "
"for user %s in domain %s to Domain controller %s. "
"Error was %s.\n", user_info->smb_name,
- user_info->domain, dc_name,
+ user_info->client_domain, dc_name,
nt_errstr(nt_status)));
/* map to something more useful */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-0-test updated - release-3-0-28a-6-g3100119
The branch, v3-0-test has been updated
via 3100119b97064135b4c696227349dd174d5663bf (commit)
from 34500b412bf4c67c28d005a3395ea4f4a26622f6 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-0-test
- Log -
commit 3100119b97064135b4c696227349dd174d5663bf
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Fri Mar 14 18:01:06 2008 +0100
Fix bug 4901
Thanks to Laurent Pinchart for bugging me
---
Summary of changes:
source/passdb/pdb_ldap.c | 11 ---
1 files changed, 8 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index 8c6fa81..e1f57a8 100644
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -1795,8 +1795,9 @@ static NTSTATUS ldapsam_update_sam_account(struct
pdb_methods *my_methods, struc
ldap_mods_free(mods,True);
return NT_STATUS_UNSUCCESSFUL;
}
-
- if (mods == NULL) {
+
+ if ((lp_ldap_passwd_sync() != LDAP_PASSWD_SYNC_ONLY)
+ && (mods == NULL)) {
DEBUG(4,("ldapsam_update_sam_account: mods is empty: nothing to
update for user: %s\n",
pdb_get_username(newpwd)));
SAFE_FREE(dn);
@@ -1804,7 +1805,11 @@ static NTSTATUS ldapsam_update_sam_account(struct
pdb_methods *my_methods, struc
}
ret = ldapsam_modify_entry(my_methods,newpwd,dn,mods,LDAP_MOD_REPLACE,
element_is_changed);
- ldap_mods_free(mods,True);
+
+ if (mods != NULL) {
+ ldap_mods_free(mods,True);
+ }
+
SAFE_FREE(dn);
/*
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-244-g1dd8fa9
The branch, v3-2-test has been updated
via 1dd8fa9a521046f1de8173ac00224706c5249665 (commit)
from 2546da817f666914c1c220ec1fedc19aa41b25ad (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 1dd8fa9a521046f1de8173ac00224706c5249665
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date: Fri Mar 14 18:01:06 2008 +0100
Fix bug 4901
---
Summary of changes:
WHATSNEW.txt |1 +
source/passdb/pdb_ldap.c | 11 ---
2 files changed, 9 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 3928e6d..a9ca352 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -305,6 +305,7 @@ o Volker Lendecke <[EMAIL PROTECTED]>
* Add implicit temporary talloc contexts via talloc_stack().
* Speed up the smbclient "get" command
* Add the aio_fork module
+* Fix bug 4901
o Derrell Lipman <[EMAIL PROTECTED]>
* Modified libsmbclient API for more easily maintaining ABI compatibility
diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index dec9b5b..d941abb 100644
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -1913,8 +1913,9 @@ static NTSTATUS ldapsam_update_sam_account(struct
pdb_methods *my_methods, struc
ldap_mods_free(mods,True);
return NT_STATUS_UNSUCCESSFUL;
}
-
- if (mods == NULL) {
+
+ if ((lp_ldap_passwd_sync() != LDAP_PASSWD_SYNC_ONLY)
+ && (mods == NULL)) {
DEBUG(4,("ldapsam_update_sam_account: mods is empty: nothing to
update for user: %s\n",
pdb_get_username(newpwd)));
SAFE_FREE(dn);
@@ -1922,7 +1923,11 @@ static NTSTATUS ldapsam_update_sam_account(struct
pdb_methods *my_methods, struc
}
ret = ldapsam_modify_entry(my_methods,newpwd,dn,mods,LDAP_MOD_REPLACE,
element_is_changed);
- ldap_mods_free(mods,True);
+
+ if (mods != NULL) {
+ ldap_mods_free(mods,True);
+ }
+
SAFE_FREE(dn);
/*
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1298-g08b41e1
The branch, v4-0-test has been updated
via 08b41e10699c7bb8058ab0ab61f17a1bbfcc1ce4 (commit)
via d6fd98a307f83fd492ef73bf6ec281f9f11286f2 (commit)
from ff3af1703ddc9e5383f32156bc5be8351f795e76 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit 08b41e10699c7bb8058ab0ab61f17a1bbfcc1ce4
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Fri Mar 14 14:33:18 2008 +0100
swig: regenerate _wrap.c files
metze
commit d6fd98a307f83fd492ef73bf6ec281f9f11286f2
Author: Stefan Metzmacher <[EMAIL PROTECTED]>
Date: Fri Mar 14 14:32:26 2008 +0100
swig: make the code more portable and use NT_STATUS_V() and W_ERROR_V()
metze
---
Summary of changes:
source/lib/registry/registry_wrap.c| 26 +++---
source/libcli/security/security_wrap.c |8 ++--
source/libcli/swig/libcli_nbt_wrap.c |2 +-
source/libcli/util/errors.i|4 +-
source/libnet/net_wrap.c | 60
source/scripting/python/misc_wrap.c|2 +-
6 files changed, 51 insertions(+), 51 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/lib/registry/registry_wrap.c
b/source/lib/registry/registry_wrap.c
index c5741b7..51c255e 100644
--- a/source/lib/registry/registry_wrap.c
+++ b/source/lib/registry/registry_wrap.c
@@ -2950,7 +2950,7 @@ SWIGINTERN PyObject *_wrap_Registry(PyObject
*SWIGUNUSEDPARM(self), PyObject *ar
}
result = reg_open_local(arg1,arg2,arg3,arg4);
if (!W_ERROR_IS_OK(result)) {
-PyObject *obj = Py_BuildValue((char *)"(i,s)", (&result)->v,
win_errstr(result));
+PyObject *obj = Py_BuildValue((char *)"(i,s)", W_ERROR_V(result),
win_errstr(result));
PyErr_SetObject(PyExc_RuntimeError, obj);
SWIG_fail;
} else if (resultobj == NULL) {
@@ -3001,7 +3001,7 @@ SWIGINTERN PyObject
*_wrap_reg_get_predefined_key_by_name(PyObject *SWIGUNUSEDPA
arg3 = (struct registry_key **)(argp3);
result = reg_get_predefined_key_by_name(arg1,(char const *)arg2,arg3);
if (!W_ERROR_IS_OK(result)) {
-PyObject *obj = Py_BuildValue((char *)"(i,s)", (&result)->v,
win_errstr(result));
+PyObject *obj = Py_BuildValue((char *)"(i,s)", W_ERROR_V(result),
win_errstr(result));
PyErr_SetObject(PyExc_RuntimeError, obj);
SWIG_fail;
} else if (resultobj == NULL) {
@@ -3044,7 +3044,7 @@ SWIGINTERN PyObject *_wrap_reg_key_del_abs(PyObject
*SWIGUNUSEDPARM(self), PyObj
arg2 = (char *)(buf2);
result = reg_key_del_abs(arg1,(char const *)arg2);
if (!W_ERROR_IS_OK(result)) {
-PyObject *obj = Py_BuildValue((char *)"(i,s)", (&result)->v,
win_errstr(result));
+PyObject *obj = Py_BuildValue((char *)"(i,s)", W_ERROR_V(result),
win_errstr(result));
PyErr_SetObject(PyExc_RuntimeError, obj);
SWIG_fail;
} else if (resultobj == NULL) {
@@ -3095,7 +3095,7 @@ SWIGINTERN PyObject
*_wrap_reg_get_predefined_key(PyObject *SWIGUNUSEDPARM(self)
arg3 = (struct registry_key **)(argp3);
result = reg_get_predefined_key(arg1,arg2,arg3);
if (!W_ERROR_IS_OK(result)) {
-PyObject *obj = Py_BuildValue((char *)"(i,s)", (&result)->v,
win_errstr(result));
+PyObject *obj = Py_BuildValue((char *)"(i,s)", W_ERROR_V(result),
win_errstr(result));
PyErr_SetObject(PyExc_RuntimeError, obj);
SWIG_fail;
} else if (resultobj == NULL) {
@@ -3136,7 +3136,7 @@ SWIGINTERN PyObject *_wrap_reg_diff_apply(PyObject
*SWIGUNUSEDPARM(self), PyObje
arg2 = (char *)(buf2);
result = reg_diff_apply(arg1,(char const *)arg2);
if (!W_ERROR_IS_OK(result)) {
-PyObject *obj = Py_BuildValue((char *)"(i,s)", (&result)->v,
win_errstr(result));
+PyObject *obj = Py_BuildValue((char *)"(i,s)", W_ERROR_V(result),
win_errstr(result));
PyErr_SetObject(PyExc_RuntimeError, obj);
SWIG_fail;
} else if (resultobj == NULL) {
@@ -3194,7 +3194,7 @@ SWIGINTERN PyObject *_wrap_reg_generate_diff(PyObject
*SWIGUNUSEDPARM(self), PyO
}
result = reg_generate_diff(arg1,arg2,(struct reg_diff_callbacks const
*)arg3,arg4);
if (!W_ERROR_IS_OK(result)) {
-PyObject *obj = Py_BuildValue((char *)"(i,s)", (&result)->v,
win_errstr(result));
+PyObject *obj = Py_BuildValue((char *)"(i,s)", W_ERROR_V(result),
win_errstr(result));
PyErr_SetObject(PyExc_RuntimeError, obj);
SWIG_fail;
} else if (resultobj == NULL) {
@@ -3260,7 +3260,7 @@ SWIGINTERN PyObject
*_wrap_reg_mount_hive__SWIG_0(PyObject *SWIGUNUSEDPARM(self)
}
result = reg_mount_hive(arg1,arg2,arg3,(char const **)arg4);
if (!W_ERROR_IS_OK(result)) {
-PyObject *obj = Py_BuildValue((char *)"(i,s)", (&result)->v,
win_errstr(result));
+PyObject *obj = Py_BuildValue((char *)"(i,s)", W_ERROR_V(result),
win_errstr(result));
PyErr_SetObject(PyExc_RuntimeError, obj);
SWIG_fail;
} else if (resultobj == NULL) {
@
[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-243-g2546da8
The branch, v3-2-test has been updated
via 2546da817f666914c1c220ec1fedc19aa41b25ad (commit)
via ddd564e8bf2b115aa5dbcbebd4be30b749ad8752 (commit)
via 83baff78ce752a9129554a456cc24d043d419cd1 (commit)
from 8dad80b4719691d66827ed46bebb963c0f8ba568 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -
commit 2546da817f666914c1c220ec1fedc19aa41b25ad
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Fri Mar 14 09:39:58 2008 +0100
libreplace: fix samba4 build (by not setting global LIBS).
This corrects the earlier fix of the standalone build, by setting
LIBS to the desired value only in configure.ac but not in getifaddrs.m4.
Not that this changes the standalone build in that it adds these libs
undconditionally and not only if they are needed by the getifaddrs
replacement functions.
Michael
(cherry picked from commit ff3af1703ddc9e5383f32156bc5be8351f795e76)
commit ddd564e8bf2b115aa5dbcbebd4be30b749ad8752
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Fri Mar 14 08:52:16 2008 +0100
libreplace: add -I$libreplacedir to CPPFLAGS for getifaddrs tests.
This is needed, otherwise $libreplacedir/system/network.h does not
find $libreplacedir/getaddrinfo.h on some systems (solaris, e.g.).
Michael
(cherry picked from commit 297c3bece094ddb5f268b02e61e33f512ccfe6f5)
commit 83baff78ce752a9129554a456cc24d043d419cd1
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Fri Mar 14 08:49:34 2008 +0100
libreplace: add an inet_aton() function that calls inet_pton().
inet_aton() is even needed inside libreplace, in the implementation
of rep_getaddrinfo().
Michael
(cherry picked from commit bcb2f3a880f8da8f9bedb7a8e61d7d7b533f1919)
---
Summary of changes:
source/lib/replace/README|1 +
source/lib/replace/configure.ac |3 +++
source/lib/replace/getifaddrs.m4 |7 ---
source/lib/replace/{socket.c => inet_aton.c} | 18 ++
source/lib/replace/inet_aton.m4 |1 +
source/lib/replace/libreplace.m4 |1 +
source/lib/replace/replace.h |5 +
source/lib/replace/system/network.h |5 +
8 files changed, 26 insertions(+), 15 deletions(-)
copy source/lib/replace/{socket.c => inet_aton.c} (76%)
create mode 100644 source/lib/replace/inet_aton.m4
Changeset truncated at 500 lines:
diff --git a/source/lib/replace/README b/source/lib/replace/README
index 268a1b1..aae1ccb 100644
--- a/source/lib/replace/README
+++ b/source/lib/replace/README
@@ -52,6 +52,7 @@ readline (the library)
inet_ntoa
inet_ntop
inet_pton
+inet_aton
strtoll
strtoull
socketpair
diff --git a/source/lib/replace/configure.ac b/source/lib/replace/configure.ac
index f5e054f..298f5a6 100644
--- a/source/lib/replace/configure.ac
+++ b/source/lib/replace/configure.ac
@@ -21,6 +21,9 @@ if test "$ac_cv_prog_gcc" = yes; then
CFLAGS="$CFLAGS -Wno-format-y2k"
fi
+LIBS="$SOCKET_LIBS $NSL_LIBS"
+AC_SUBST(LIBS)
+
AC_SUBST(LDFLAGS)
AC_OUTPUT(Makefile)
diff --git a/source/lib/replace/getifaddrs.m4 b/source/lib/replace/getifaddrs.m4
index 6cca155..f4cf4e4 100644
--- a/source/lib/replace/getifaddrs.m4
+++ b/source/lib/replace/getifaddrs.m4
@@ -38,6 +38,8 @@ fi
#
old_LIBS=$LIBS
LIBS="$NSL_LIBS $SOCKET_LIBS"
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -I$libreplacedir"
iface=no;
##
# look for a method of finding the list of network interfaces
@@ -79,7 +81,6 @@ AC_TRY_RUN([
libreplace_cv_HAVE_IFACE_AIX=yes,libreplace_cv_HAVE_IFACE_AIX=no,libreplace_cv_HAVE_IFACE_AIX=cross)])
if test x"$libreplace_cv_HAVE_IFACE_AIX" = x"yes"; then
iface=yes;AC_DEFINE(HAVE_IFACE_AIX,1,[Whether iface AIX is available])
- old_LIBS="$old_LIBS $LIBS"
fi
fi
@@ -100,7 +101,6 @@ AC_TRY_RUN([
libreplace_cv_HAVE_IFACE_IFCONF=yes,libreplace_cv_HAVE_IFACE_IFCONF=no,libreplace_cv_HAVE_IFACE_IFCONF=cross)])
if test x"$libreplace_cv_HAVE_IFACE_IFCONF" = x"yes"; then
iface=yes;AC_DEFINE(HAVE_IFACE_IFCONF,1,[Whether iface ifconf is
available])
- old_LIBS="$old_LIBS $LIBS"
fi
fi
@@ -120,8 +120,9 @@ AC_TRY_RUN([
libreplace_cv_HAVE_IFACE_IFREQ=yes,libreplace_cv_HAVE_IFACE_IFREQ=no,libreplace_cv_HAVE_IFACE_IFREQ=cross)])
if test x"$libreplace_cv_HAVE_IFACE_IFREQ" = x"yes"; then
iface=yes;AC_DEFINE(HAVE_IFACE_IFREQ,1,[Whether iface ifreq is available])
- old_LIBS="$old_LIBS $LIBS"
fi
fi
LIBS=$old_LIBS
+CPPFLAGS="$SAVE_CPPFLAGS"
+
diff --git a/source/lib/replace/socket.c b/source/lib/replace/inet_aton.c
similarity index 76%
copy from source/lib/replace/socket.c
copy to source/lib/replace/inet_aton.c
index 35e975f..3eb58f0 100644
--- a/source/lib/replace/socket.c
+++ b/sou
[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-1296-gff3af17
The branch, v4-0-test has been updated
via ff3af1703ddc9e5383f32156bc5be8351f795e76 (commit)
via 297c3bece094ddb5f268b02e61e33f512ccfe6f5 (commit)
via 3b2a3da2f73020b1d3b08a05a479de380b2aa5c4 (commit)
via bcb2f3a880f8da8f9bedb7a8e61d7d7b533f1919 (commit)
from db3b5f16ec8d9b83d8a82a535a4847dce5923663 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -
commit ff3af1703ddc9e5383f32156bc5be8351f795e76
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Fri Mar 14 09:39:58 2008 +0100
libreplace: fix samba4 build (by not setting global LIBS).
This corrects the earlier fix of the standalone build, by setting
LIBS to the desired value only in configure.ac but not in getifaddrs.m4.
Not that this changes the standalone build in that it adds these libs
undconditionally and not only if they are needed by the getifaddrs
replacement functions.
Michael
commit 297c3bece094ddb5f268b02e61e33f512ccfe6f5
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Fri Mar 14 08:52:16 2008 +0100
libreplace: add -I$libreplacedir to CPPFLAGS for getifaddrs tests.
This is needed, otherwise $libreplacedir/system/network.h does not
find $libreplacedir/getaddrinfo.h on some systems (solaris, e.g.).
Michael
commit 3b2a3da2f73020b1d3b08a05a479de380b2aa5c4
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Fri Mar 14 09:04:00 2008 +0100
heimdal_build: fix linkage of asn1_compile and compile_et.
Now inet_aton is available from libreplace.
Michael
commit bcb2f3a880f8da8f9bedb7a8e61d7d7b533f1919
Author: Michael Adam <[EMAIL PROTECTED]>
Date: Fri Mar 14 08:49:34 2008 +0100
libreplace: add an inet_aton() function that calls inet_pton().
inet_aton() is even needed inside libreplace, in the implementation
of rep_getaddrinfo().
Michael
---
Summary of changes:
source/heimdal_build/config.mk |2 --
source/lib/replace/README|1 +
source/lib/replace/configure.ac |3 +++
source/lib/replace/getifaddrs.m4 |7 ---
source/lib/replace/{socket.c => inet_aton.c} | 18 ++
source/lib/replace/inet_aton.m4 |1 +
source/lib/replace/libreplace.m4 |1 +
source/lib/replace/replace.h |5 +
source/lib/replace/system/network.h |5 +
9 files changed, 26 insertions(+), 17 deletions(-)
copy source/lib/replace/{socket.c => inet_aton.c} (76%)
create mode 100644 source/lib/replace/inet_aton.m4
Changeset truncated at 500 lines:
diff --git a/source/heimdal_build/config.mk b/source/heimdal_build/config.mk
index 0235a97..45bfd8e 100644
--- a/source/heimdal_build/config.mk
+++ b/source/heimdal_build/config.mk
@@ -471,7 +471,6 @@ OBJ_FILES = \
../heimdal/lib/roken/get_window_size.ho \
../heimdal/lib/roken/estrdup.ho \
../heimdal/lib/roken/ecalloc.ho \
- ../heimdal/lib/roken/inet_aton.ho \
../heimdal/lib/asn1/symbol.ho \
../heimdal/lib/vers/print_version.ho \
../lib/socket_wrapper/socket_wrapper.ho \
@@ -501,7 +500,6 @@ OBJ_FILES = ../heimdal/lib/vers/print_version.ho \
../heimdal/lib/roken/get_window_size.ho \
../heimdal/lib/roken/strupr.ho \
../heimdal/lib/roken/setprogname.ho \
- ../heimdal/lib/roken/inet_aton.ho \
../lib/socket_wrapper/socket_wrapper.ho \
replace.ho
PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H
EXT_SOCKET EXT_NSL
diff --git a/source/lib/replace/README b/source/lib/replace/README
index 268a1b1..aae1ccb 100644
--- a/source/lib/replace/README
+++ b/source/lib/replace/README
@@ -52,6 +52,7 @@ readline (the library)
inet_ntoa
inet_ntop
inet_pton
+inet_aton
strtoll
strtoull
socketpair
diff --git a/source/lib/replace/configure.ac b/source/lib/replace/configure.ac
index f5e054f..298f5a6 100644
--- a/source/lib/replace/configure.ac
+++ b/source/lib/replace/configure.ac
@@ -21,6 +21,9 @@ if test "$ac_cv_prog_gcc" = yes; then
CFLAGS="$CFLAGS -Wno-format-y2k"
fi
+LIBS="$SOCKET_LIBS $NSL_LIBS"
+AC_SUBST(LIBS)
+
AC_SUBST(LDFLAGS)
AC_OUTPUT(Makefile)
diff --git a/source/lib/replace/getifaddrs.m4 b/source/lib/replace/getifaddrs.m4
index 6cca155..f4cf4e4 100644
--- a/source/lib/replace/getifaddrs.m4
+++ b/source/lib/replace/getifaddrs.m4
@@ -38,6 +38,8 @@ fi
#
old_LIBS=$LIBS
LIBS="$NSL_LIBS $SOCKET_LIBS"
+SAVE_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS -I$libreplacedir"
iface=no;
##
# look for a method of finding the list of network interfaces
@@ -79,7 +81,6 @@ AC_TRY_RUN([
libreplace_cv_HAVE_IFACE_AIX=yes,libreplace_cv_HAVE_IFACE_AIX=no,libreplace_cv_HAVE_IFACE_AIX=cross)])
if test x"$libreplace_cv_HAVE_IFACE_AIX
