[DRBD-cvs] svn commit by phil - r2254 - trunk/user - Thanks to the report of Simon Graham...

[drbd-cvs at lists.linbit.com]

Author: phil
Date: 2006-07-03 17:38:37 +0200 (Mon, 03 Jul 2006)
New Revision: 2254

Modified:
   trunk/user/drbdadm_adjust.c
   trunk/user/drbdadm_main.c
Log:
Thanks to the report of Simon Graham...



Modified: trunk/user/drbdadm_adjust.c
===================================================================
--- trunk/user/drbdadm_adjust.c	2006-06-30 13:03:02 UTC (rev 2253)
+++ trunk/user/drbdadm_adjust.c	2006-07-03 15:38:37 UTC (rev 2254)
@@ -191,9 +191,6 @@
 	fclose(yyin);
 	waitpid(pid,0,0);
 
-	convert_discard_opt(res);
-	convert_after_option(res);
-
 	do_attach  = !opts_equal(res->disk_options, running->disk_options);
 	if(running->me) {
 		do_attach |= strcmp(res->me->device, running->me->device);

Modified: trunk/user/drbdadm_main.c
===================================================================
--- trunk/user/drbdadm_main.c	2006-06-30 13:03:02 UTC (rev 2253)
+++ trunk/user/drbdadm_main.c	2006-07-03 15:38:37 UTC (rev 2254)
@@ -775,8 +775,6 @@
   ssprintf(argv[argc++],"%s:%s",res->peer->address,res->peer->port);
   argv[argc++]=res->protocol;
 
-  convert_discard_opt(res);
-
   opt=res->net_options;
   make_options(opt);
 
@@ -816,8 +814,6 @@
   argv[argc++]=res->me->device;
   argv[argc++]="syncer";
 
-  convert_after_option(res);
-
   opt=res->sync_options;
   make_options(opt);
   argv[argc++]=0;
@@ -1291,6 +1287,7 @@
   const char *my_ip;
 
   my_ip = res->me->address;
+  sin_addr.s_addr = inet_addr(my_ip);
 
   /* does DRBD support inet6? */
   family = AF_INET;
@@ -1314,7 +1311,7 @@
 
   if (valid == 0) {
     fprintf(stderr, "OOPS, the IP address %s isn't configure/up on your system!\n", my_ip);
-#ifdef INVALID_IP_IS_INVALID_CONF
+#if INVALID_IP_IS_INVALID_CONF
     config_valid = 0;
 #endif
   }
@@ -1666,15 +1663,22 @@
       if (optind + 1 > argc && !is_dump)
         print_usage_and_exit("missing arguments"); // arguments missing.
 
-      if(!is_dump) expand_common();
+      if(!is_dump) {
+	expand_common();
 
+	global_validate(); 
+	if(!config_valid) exit(E_config_invalid);
+
+        for_each_resource(res,tmp,config) {
+	  convert_after_option(res);
+	  convert_discard_opt(res);
+	}
+      }
+
       if ( optind==argc || !strcmp(argv[optind],"all") ) {
         if (is_dump) {
 	  dump_global_info();
 	  dump_common_info();
-	} else {
-	  global_validate(); 
-	  if(!config_valid) exit(E_config_invalid);
 	}
         for_each_resource(res,tmp,config) {
 	  if( (rv |= cmd->function(res,cmd->name)) >= 10 ) {