svn commit: samba r21729 - in branches/SAMBA_4_0: .
source/lib/socket_wrapper
jelmer at samba.org
jelmer at samba.org
Tue Mar 6 23:03:36 GMT 2007
Author: jelmer
Date: 2007-03-06 23:03:34 +0000 (Tue, 06 Mar 2007)
New Revision: 21729
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21729
Log:
Some more tests
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
branches/SAMBA_4_0/source/lib/socket_wrapper/testsuite.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:merge
...skipped...
Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c 2007-03-06 22:54:42 UTC (rev 21728)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/socket_wrapper.c 2007-03-06 23:03:34 UTC (rev 21729)
@@ -199,15 +199,14 @@
return s;
}
-static unsigned int socket_wrapper_default_iface(void)
+unsigned int socket_wrapper_default_iface(void)
{
const char *s = getenv("SOCKET_WRAPPER_DEFAULT_IFACE");
if (s) {
unsigned int iface;
- if (sscanf(s, "%u", &iface) == 1) {
- if (iface >= 1 && iface <= MAX_WRAPPED_INTERFACES) {
- return iface;
- }
+ iface = atoi(s);
+ if (iface >= 1 && iface <= MAX_WRAPPED_INTERFACES) {
+ return iface;
}
}
Modified: branches/SAMBA_4_0/source/lib/socket_wrapper/testsuite.c
===================================================================
--- branches/SAMBA_4_0/source/lib/socket_wrapper/testsuite.c 2007-03-06 22:54:42 UTC (rev 21728)
+++ branches/SAMBA_4_0/source/lib/socket_wrapper/testsuite.c 2007-03-06 23:03:34 UTC (rev 21729)
@@ -26,15 +26,24 @@
#include "torture/torture.h"
static char *old_dir = NULL;
+static char *old_iface = NULL;
static void backup_env(void)
{
old_dir = getenv("SOCKET_WRAPPER_DIR");
+ old_iface = getenv("SOCKET_WRAPPER_DEFAULT_IFACE");
}
static void restore_env(void)
{
- setenv("SOCKET_WRAPPER_DIR", old_dir, 1);
+ if (old_dir == NULL)
+ unsetenv("SOCKET_WRAPPER_DIR");
+ else
+ setenv("SOCKET_WRAPPER_DIR", old_dir, 1);
+ if (old_iface == NULL)
+ unsetenv("SOCKET_WRAPPER_DEFAULT_IFACE");
+ else
+ setenv("SOCKET_WRAPPER_DEFAULT_IFACE", old_iface, 1);
}
static bool test_socket_wrapper_dir(struct torture_context *tctx)
@@ -70,6 +79,20 @@
return true;
}
+unsigned int socket_wrapper_default_iface(void);
+static bool test_socket_wrapper_default_iface(struct torture_context *tctx)
+{
+ backup_env();
+ unsetenv("SOCKET_WRAPPER_DEFAULT_IFACE");
+ torture_assert_int_equal(tctx, socket_wrapper_default_iface(), 1, "unset");
+ setenv("SOCKET_WRAPPER_DEFAULT_IFACE", "2", 1);
+ torture_assert_int_equal(tctx, socket_wrapper_default_iface(), 2, "unset");
+ setenv("SOCKET_WRAPPER_DEFAULT_IFACE", "bla", 1);
+ torture_assert_int_equal(tctx, socket_wrapper_default_iface(), 1, "unset");
+ restore_env();
+ return true;
+}
+
struct torture_suite *torture_local_socket_wrapper(TALLOC_CTX *mem_ctx)
{
struct torture_suite *suite = torture_suite_create(mem_ctx,
@@ -77,6 +100,7 @@
torture_suite_add_simple_test(suite, "socket_wrapper_dir", test_socket_wrapper_dir);
torture_suite_add_simple_test(suite, "socket", test_swrap_socket);
+ torture_suite_add_simple_test(suite, "socket_wrapper_default_iface", test_socket_wrapper_default_iface);
return suite;
}
More information about the samba-cvs
mailing list