[DRBD-cvs] DRBD CVS: user by phil from

drbd-cvs@linbit.com drbd-cvs@linbit.com
Sat, 10 Jan 2004 16:30:41 +0100 (CET)


DRBD CVS committal

Author  : phil
Host    : 
Project : drbd
Module  : user

Dir     : drbd/user


Modified Files:
      Tag: rel-0_7-branch
	Makefile drbdadm_main.c 


Log Message:
drbdadm some-cmd last-resource-of-your-config
failed with the message 
'last-resource-of-your-config' not defined in your config.

Fixed it.

Lars, why did you converted it to a doulbe linked list ? -- This
costs you a beer :)

===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Makefile,v
retrieving revision 1.7.2.11
retrieving revision 1.7.2.12
diff -u -3 -r1.7.2.11 -r1.7.2.12
--- Makefile	30 Oct 2003 08:12:38 -0000	1.7.2.11
+++ Makefile	10 Jan 2004 15:30:41 -0000	1.7.2.12
@@ -17,7 +17,7 @@
 # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-CFLAGS = -c -Wall
+CFLAGS = -g -c -Wall
 CC = gcc
 
 all: drbdsetup drbdadm
===================================================================
RCS file: /var/lib/cvs/drbd/drbd/user/Attic/drbdadm_main.c,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -u -3 -r1.1.2.27 -r1.1.2.28
--- drbdadm_main.c	15 Dec 2003 15:25:53 -0000	1.1.2.27
+++ drbdadm_main.c	10 Jan 2004 15:30:41 -0000	1.1.2.28
@@ -45,6 +45,9 @@
 	     ({ tmp != (config) && (tmp = res->next); }); \
 	     res = tmp)
 
+#define for_completed(res,tmp,config)                     \
+            ( (res) == (tmp) ) 
+
 // basic format
 #define INDENT "    "
 #define FMT    INDENT "%-12s"
@@ -729,7 +732,7 @@
 	  for_each_resource(res,tmp,config) {
 	    if(!strcmp(argv[i],res->name)) break;
 	  }
-	  if(tmp == config) {
+	  if(for_completed(res,tmp,config)) {
 	    fprintf(stderr,"'%s' not defined in you config.\n",argv[i]);
 	    exit(20);
 	  }