[Reconnoiter-devel] [reconnoiter commit] r1317 - trunk/src

svn-commit at lists.omniti.com svn-commit at lists.omniti.com
Thu May 27 13:38:06 EDT 2010


Author: jesus
Date: 2010-05-27 13:38:06 -0400 (Thu, 27 May 2010)
New Revision: 1317

Modified:
   trunk/src/noit_conf_checks.c
   trunk/src/stratcon_datastore.c
Log:
refs #284

Modified: trunk/src/noit_conf_checks.c
===================================================================
--- trunk/src/noit_conf_checks.c	2010-05-27 17:34:58 UTC (rev 1316)
+++ trunk/src/noit_conf_checks.c	2010-05-27 17:38:06 UTC (rev 1317)
@@ -601,7 +601,7 @@
   }
 
   info = noit_console_userdata_get(ncct, NOIT_CONF_T_USERDATA);
-  if(info) path = basepath = info->path;
+  if(info && info->path) path = basepath = info->path;
   if(!info && argc == 0) {
     nc_printf(ncct, "argument required when not in configuration mode\n");
     return -1;

Modified: trunk/src/stratcon_datastore.c
===================================================================
--- trunk/src/stratcon_datastore.c	2010-05-27 17:34:58 UTC (rev 1316)
+++ trunk/src/stratcon_datastore.c	2010-05-27 17:38:06 UTC (rev 1317)
@@ -1386,6 +1386,7 @@
 
   if(fqdn_out) *fqdn_out = info ? info->fqdn : NULL;
   if(dsn_out) *dsn_out = info ? info->dsn : NULL;
+  assert(uuidinfo);
   if(remote_cn_out) *remote_cn_out = uuidinfo->remote_cn;
   if(storagenode_id_out) *storagenode_id_out = uuidinfo->storagenode_id;
   if(sid_out) *sid_out = uuidinfo->sid;



More information about the Reconnoiter-devel mailing list