Attachment #59431 for bug #93400




      if (dbus_message_get_args (reply, &error_args, DBUS_TYPE_STRING, &dbus_string, DBUS_TYPE_INVALID))
	{
	  value = ((dbus_string == NULL) || (strcmp(dbus_string,"")==0)  ? NULL : g_strdup (dbus_string));
	  dbus_free (dbus_string);
	}
      else
	g_print("GetKey error in dbus_message_get_args: %s\n",error_args.message);

      if (dbus_message_get_args (reply, &error_args, DBUS_TYPE_STRING, &dbus_string, DBUS_TYPE_INVALID))
	{
	  value = ((dbus_string == NULL) || (strcmp(dbus_string,"")==0)  ? NULL : g_strdup (dbus_string));
	  dbus_free (dbus_string);
	}
      else
	g_print("GetKey error in dbus_message_get_args: %s\n",error_args.message);

      if (dbus_message_get_args (reply, &error_args, DBUS_TYPE_STRING, &dbus_string, DBUS_TYPE_INVALID))
	{
	  value = ((dbus_string == NULL) || (strcmp(dbus_string,"")==0) ? NULL : g_strdup (dbus_string));
	  dbus_free (dbus_string);
	}
      else
	g_print("ShareGetName error in dbus_message_get_args: %s\n",error_args.message);




	  value = "";
	}
      dbus_message_append_args (reply_message, DBUS_TYPE_STRING, &value, DBUS_TYPE_INVALID);
      dbus_free (path);
      dbus_free (key);
      if (reply_message)
	{
	  dbus_connection_send (connection, reply_message, NULL);

	  daemon_log(LOG_INFO,"Path %s is sharename %s\n", path, sharename);
	}
      dbus_message_append_args (reply_message, DBUS_TYPE_STRING, &sharename, DBUS_TYPE_INVALID);
      dbus_free (path);
      if (reply_message)
	{
	  dbus_connection_send (connection, reply_message, NULL);

		  }
	    }
	}
      dbus_free (path);
      dbus_free (newname);
      if (reply_message)
	{
	  dbus_connection_send (connection, reply_message, NULL);

	  dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
	}
    exit:
      dbus_free (name);
      dbus_free (path);
      if (reply_message)
	{
	  dbus_connection_send (connection, reply_message, NULL);

	    daemon_log(LOG_INFO,"SU Sharename not in used: %s\n", sharename);
	    dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
	  }
      dbus_free (sharename);
      if (reply_message)
	{
	  dbus_connection_send (connection, reply_message, NULL);

	DBUS_TYPE_INVALID)) {
      writable =  smbparser_sharename_is_writable(shares,path);
      daemon_log(LOG_INFO,"Path %s -> %d\n", path, writable);
      dbus_free (path);
      reply_message = dbus_message_new_method_return (message);
      dbus_message_append_args (reply_message, DBUS_TYPE_BOOLEAN, &writable, DBUS_TYPE_INVALID);
      if (reply_message)

      else
	daemon_log(LOG_ERR,"SSK Sharename path:%s not found\n", path);
	
      dbus_free (path);
      dbus_free (key);
      dbus_free (value);
    } else {
      daemon_log(LOG_ERR,"SetKey received, but error getting message: %s\n", error.message);
      dbus_error_free (&error);

      else
	daemon_log(LOG_ERR,"SRK Sharename path:%s not found\n", path);

      dbus_free (path);
      dbus_free (key);
    } else {
      daemon_log(LOG_ERR,"RemoveKey received, but error getting message: %s\n", error.message);
      dbus_error_free (&error);

	}
      else
	daemon_log(LOG_ERR,"SRS Sharename path:%s not found\n", path);
      dbus_free (path);
    } else {
      daemon_log(LOG_ERR,"RemoveSection received, but error getting message: %s\n", error.message);
      dbus_error_free (&error);

Return to bug 93400

Lines 205-212 path_message_func (DBusConnection *conn Link Here

(-)src/smbparser-dbus-server.c (-15 lines)
205	value = "";	205	value = "";
206	}	206	}
207	dbus_message_append_args (reply_message, DBUS_TYPE_STRING, &value, DBUS_TYPE_INVALID);	207	dbus_message_append_args (reply_message, DBUS_TYPE_STRING, &value, DBUS_TYPE_INVALID);
208	dbus_free (path);
209	dbus_free (key);
210	if (reply_message)	208	if (reply_message)
211	{	209	{
212	dbus_connection_send (connection, reply_message, NULL);	210	dbus_connection_send (connection, reply_message, NULL);
Lines 244-250 path_message_func (DBusConnection *conn Link Here
244	daemon_log(LOG_INFO,"Path %s is sharename %s\n", path, sharename);	242	daemon_log(LOG_INFO,"Path %s is sharename %s\n", path, sharename);
245	}	243	}
246	dbus_message_append_args (reply_message, DBUS_TYPE_STRING, &sharename, DBUS_TYPE_INVALID);	244	dbus_message_append_args (reply_message, DBUS_TYPE_STRING, &sharename, DBUS_TYPE_INVALID);
247	dbus_free (path);
248	if (reply_message)	245	if (reply_message)
249	{	246	{
250	dbus_connection_send (connection, reply_message, NULL);	247	dbus_connection_send (connection, reply_message, NULL);
Lines 309-316 path_message_func (DBusConnection *conn Link Here
309	}	306	}
310	}	307	}
311	}	308	}
312	dbus_free (path);
313	dbus_free (newname);
314	if (reply_message)	309	if (reply_message)
315	{	310	{
316	dbus_connection_send (connection, reply_message, NULL);	311	dbus_connection_send (connection, reply_message, NULL);
Lines 392-399 path_message_func (DBusConnection *conn Link Here
392	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);	387	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
393	}	388	}
394	exit:	389	exit:
395	dbus_free (name);
396	dbus_free (path);
397	if (reply_message)	390	if (reply_message)
398	{	391	{
399	dbus_connection_send (connection, reply_message, NULL);	392	dbus_connection_send (connection, reply_message, NULL);
Lines 439-445 path_message_func (DBusConnection *conn Link Here
439	daemon_log(LOG_INFO,"SU Sharename not in used: %s\n", sharename);	432	daemon_log(LOG_INFO,"SU Sharename not in used: %s\n", sharename);
440	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);	433	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
441	}	434	}
442	dbus_free (sharename);
443	if (reply_message)	435	if (reply_message)
444	{	436	{
445	dbus_connection_send (connection, reply_message, NULL);	437	dbus_connection_send (connection, reply_message, NULL);
Lines 468-474 path_message_func (DBusConnection *conn Link Here
468	DBUS_TYPE_INVALID)) {	460	DBUS_TYPE_INVALID)) {
469	writable = smbparser_sharename_is_writable(shares,path);	461	writable = smbparser_sharename_is_writable(shares,path);
470	daemon_log(LOG_INFO,"Path %s -> %d\n", path, writable);	462	daemon_log(LOG_INFO,"Path %s -> %d\n", path, writable);
471	dbus_free (path);
472	reply_message = dbus_message_new_method_return (message);	463	reply_message = dbus_message_new_method_return (message);
473	dbus_message_append_args (reply_message, DBUS_TYPE_BOOLEAN, &writable, DBUS_TYPE_INVALID);	464	dbus_message_append_args (reply_message, DBUS_TYPE_BOOLEAN, &writable, DBUS_TYPE_INVALID);
474	if (reply_message)	465	if (reply_message)
Lines 540-548 signal_filter (DBusConnection *connectio Link Here
540	else	531	else
541	daemon_log(LOG_ERR,"SSK Sharename path:%s not found\n", path);	532	daemon_log(LOG_ERR,"SSK Sharename path:%s not found\n", path);
542		533
543	dbus_free (path);
544	dbus_free (key);
545	dbus_free (value);
546	} else {	534	} else {
547	daemon_log(LOG_ERR,"SetKey received, but error getting message: %s\n", error.message);	535	daemon_log(LOG_ERR,"SetKey received, but error getting message: %s\n", error.message);
548	dbus_error_free (&error);	536	dbus_error_free (&error);
Lines 573-580 signal_filter (DBusConnection *connectio Link Here
573	else	561	else
574	daemon_log(LOG_ERR,"SRK Sharename path:%s not found\n", path);	562	daemon_log(LOG_ERR,"SRK Sharename path:%s not found\n", path);
575		563
576	dbus_free (path);
577	dbus_free (key);
578	} else {	564	} else {
579	daemon_log(LOG_ERR,"RemoveKey received, but error getting message: %s\n", error.message);	565	daemon_log(LOG_ERR,"RemoveKey received, but error getting message: %s\n", error.message);
580	dbus_error_free (&error);	566	dbus_error_free (&error);
Lines 602-608 signal_filter (DBusConnection *connectio Link Here
602	}	588	}
603	else	589	else
604	daemon_log(LOG_ERR,"SRS Sharename path:%s not found\n", path);	590	daemon_log(LOG_ERR,"SRS Sharename path:%s not found\n", path);
605	dbus_free (path);
606	} else {	591	} else {
607	daemon_log(LOG_ERR,"RemoveSection received, but error getting message: %s\n", error.message);	592	daemon_log(LOG_ERR,"RemoveSection received, but error getting message: %s\n", error.message);
608	dbus_error_free (&error);	593	dbus_error_free (&error);

Lines 347-353 smbparser_dbus_get_key(DBusConnection *b Link Here

(-)src/smbparser-dbus-client.c (-3 lines)
347	if (dbus_message_get_args (reply, &error_args, DBUS_TYPE_STRING, &dbus_string, DBUS_TYPE_INVALID))	347	if (dbus_message_get_args (reply, &error_args, DBUS_TYPE_STRING, &dbus_string, DBUS_TYPE_INVALID))
348	{	348	{
349	value = ((dbus_string == NULL) \|\| (strcmp(dbus_string,"")==0) ? NULL : g_strdup (dbus_string));	349	value = ((dbus_string == NULL) \|\| (strcmp(dbus_string,"")==0) ? NULL : g_strdup (dbus_string));
350	dbus_free (dbus_string);
351	}	350	}
352	else	351	else
353	g_print("GetKey error in dbus_message_get_args: %s\n",error_args.message);	352	g_print("GetKey error in dbus_message_get_args: %s\n",error_args.message);
Lines 387-393 smbparser_dbus_share_get_key(DBusConnect Link Here
387	if (dbus_message_get_args (reply, &error_args, DBUS_TYPE_STRING, &dbus_string, DBUS_TYPE_INVALID))	386	if (dbus_message_get_args (reply, &error_args, DBUS_TYPE_STRING, &dbus_string, DBUS_TYPE_INVALID))
388	{	387	{
389	value = ((dbus_string == NULL) \|\| (strcmp(dbus_string,"")==0) ? NULL : g_strdup (dbus_string));	388	value = ((dbus_string == NULL) \|\| (strcmp(dbus_string,"")==0) ? NULL : g_strdup (dbus_string));
390	dbus_free (dbus_string);
391	}	389	}
392	else	390	else
393	g_print("GetKey error in dbus_message_get_args: %s\n",error_args.message);	391	g_print("GetKey error in dbus_message_get_args: %s\n",error_args.message);
Lines 425-431 smbparser_dbus_share_get_name(DBusConnec Link Here
425	if (dbus_message_get_args (reply, &error_args, DBUS_TYPE_STRING, &dbus_string, DBUS_TYPE_INVALID))	423	if (dbus_message_get_args (reply, &error_args, DBUS_TYPE_STRING, &dbus_string, DBUS_TYPE_INVALID))
426	{	424	{
427	value = ((dbus_string == NULL) \|\| (strcmp(dbus_string,"")==0) ? NULL : g_strdup (dbus_string));	425	value = ((dbus_string == NULL) \|\| (strcmp(dbus_string,"")==0) ? NULL : g_strdup (dbus_string));
428	dbus_free (dbus_string);
429	}	426	}
430	else	427	else
431	g_print("ShareGetName error in dbus_message_get_args: %s\n",error_args.message);	428	g_print("ShareGetName error in dbus_message_get_args: %s\n",error_args.message);