From: Martin R. <mr...@us...> - 2004-09-13 21:55:26
|
Update of /cvsroot/ltp/ltp/testcases/kernel/syscalls/setdomainname In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31752 Modified Files: setdomainname01.c setdomainname02.c setdomainname03.c Log Message: Changes from SuSE for setdomainname tests Index: setdomainname02.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/setdomainname/setdomainname02.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** setdomainname02.c 1 Nov 2002 15:59:34 -0000 1.1 --- setdomainname02.c 13 Sep 2004 21:55:17 -0000 1.2 *************** *** 81,87 **** #include <errno.h> ! #include <linux/utsname.h> ! #define MAX_NAME_LEN __NEW_UTS_LEN static void cleanup(void); --- 81,87 ---- #include <errno.h> ! #include <sys/utsname.h> ! #define MAX_NAME_LEN _UTSNAME_DOMAIN_LENGTH - 1 static void cleanup(void); Index: setdomainname01.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/setdomainname/setdomainname01.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** setdomainname01.c 1 Nov 2002 15:59:34 -0000 1.1 --- setdomainname01.c 13 Sep 2004 21:55:16 -0000 1.2 *************** *** 66,74 **** #include <errno.h> ! #include <linux/utsname.h> #include "test.h" #include "usctest.h" ! #define MAX_NAME_LEN __NEW_UTS_LEN static void setup(); --- 66,75 ---- #include <errno.h> ! #include <string.h> ! #include <sys/utsname.h> #include "test.h" #include "usctest.h" ! #define MAX_NAME_LEN _UTSNAME_DOMAIN_LENGTH static void setup(); *************** *** 171,175 **** /* Restore domain name */ ! if((setdomainname(old_domain_name, MAX_NAME_LEN)) < 0 ) { tst_resm(TWARN, "setdomainname() failed while restoring" " domainname to \"%s\"", old_domain_name); --- 172,176 ---- /* Restore domain name */ ! if((setdomainname(old_domain_name, strlen(old_domain_name))) < 0 ) { tst_resm(TWARN, "setdomainname() failed while restoring" " domainname to \"%s\"", old_domain_name); Index: setdomainname03.c =================================================================== RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/setdomainname/setdomainname03.c,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** setdomainname03.c 1 Nov 2002 15:59:34 -0000 1.1 --- setdomainname03.c 13 Sep 2004 21:55:17 -0000 1.2 *************** *** 72,75 **** --- 72,76 ---- ****************************************************************/ + #include <string.h> #include <errno.h> #include <pwd.h> *************** *** 206,210 **** /* Restore domain name */ ! if((setdomainname (old_domain_name, sizeof(old_domain_name))) < 0 ) { tst_resm(TWARN, "setdomainname() failed while restoring" --- 207,211 ---- /* Restore domain name */ ! if((setdomainname (old_domain_name, strlen(old_domain_name))) < 0 ) { tst_resm(TWARN, "setdomainname() failed while restoring" |