Attachment #59430 for bug #93400




    return FALSE;
  message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "RemoveKey");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &section,
                            DBUS_TYPE_STRING, &key,
                            DBUS_TYPE_INVALID);
  dbus_connection_send (bus, message, NULL);
  dbus_message_unref (message);

    return FALSE;
  message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "SetKey");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &path,
                            DBUS_TYPE_STRING, &key,
                            DBUS_TYPE_STRING, &value,
                            DBUS_TYPE_INVALID);
  dbus_connection_send (bus, message, NULL);
  dbus_message_unref (message);

    return FALSE;
  message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareRemoveKey");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &path,
                            DBUS_TYPE_STRING, &key,
                            DBUS_TYPE_INVALID);
  dbus_connection_send (bus, message, NULL);
  dbus_message_unref (message);

    return FALSE;
  message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareSetKey");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &path,
                            DBUS_TYPE_STRING, &key,
                            DBUS_TYPE_STRING, &value,
                            DBUS_TYPE_INVALID);
  dbus_connection_send (bus, message, NULL);
  dbus_message_unref (message);

    return FALSE;
  message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "RemoveSection");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &section,
                            DBUS_TYPE_INVALID);
  dbus_connection_send (bus, message, NULL);
  dbus_message_unref (message);

    return FALSE;
  message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareRemove");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &path,
                            DBUS_TYPE_INVALID);
  dbus_connection_send (bus, message, NULL);
  dbus_message_unref (message);

    return FALSE;
  message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "RenameSection");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &section,
                            DBUS_TYPE_STRING, &newname,
                            DBUS_TYPE_INVALID);

  dbus_error_init (&error);

    return FALSE;
  message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareRename");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &path,
                            DBUS_TYPE_STRING, &newname,
                            DBUS_TYPE_INVALID);

  dbus_error_init (&error);

    return FALSE;
  message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "AddSection");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &section,
                            DBUS_TYPE_INVALID);
  dbus_error_init (&error);
  if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))

    return FALSE;
  message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareAdd");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &path,
                            DBUS_TYPE_STRING, &name,
                            DBUS_TYPE_INVALID);
  dbus_error_init (&error);
  if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))

    return FALSE;
  message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "SectionUsed");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &section,
                            DBUS_TYPE_INVALID);
  dbus_error_init (&error);
  if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))


  message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "GetKey");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &section,
                            DBUS_TYPE_STRING, &key,
                            DBUS_TYPE_INVALID);
  dbus_error_init (&error);
  if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))


  message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareGetKey");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &path,
                            DBUS_TYPE_STRING, &key,
                            DBUS_TYPE_INVALID);
  dbus_error_init (&error);
  if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))

  message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH,
                                     SMBPARSER_DBUS_INTERFACE, "ShareGetName");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &path,
                            DBUS_TYPE_INVALID);

  dbus_error_init (&error);

  message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH,
                                     SMBPARSER_DBUS_INTERFACE, "ShareIsWritable");
  dbus_message_append_args (message,
                            DBUS_TYPE_STRING, &path,
                            DBUS_TYPE_INVALID);
  dbus_error_init (&error);
  if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))




      if((sharename = smbparser_get_sharename(shares, path)))
	{
	  value =  smbparser_get_key(shares,sharename,key);
	  if (!value)
	    value = "";
	  daemon_log(LOG_INFO,"Share Get key %s in section %s -> %s\n", key, sharename,value);
	  dbus_message_append_args (reply_message, DBUS_TYPE_STRING, value?value:"", DBUS_TYPE_INVALID);
	}
      else
	{
	  daemon_log(LOG_ERR,"Share Get key path: %s not found\n",path);
	  value = "";
	}
      dbus_message_append_args (reply_message, DBUS_TYPE_STRING, &value, DBUS_TYPE_INVALID);
      dbus_free (path);
      dbus_free (key);
      if (reply_message)

      if (!(sharename =  smbparser_get_sharename(shares, path)))
	{
	  daemon_log(LOG_ERR,"SGN Sharename path:%s not found\n", path);
	  sharename = "";
	}
      else
	{
	  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_message_append_args (reply_message, DBUS_TYPE_STRING, &sharename, DBUS_TYPE_INVALID);
      dbus_free (path);
      if (reply_message)
	{

    char *sharename;
    char *newname;
    DBusMessage	*reply_message = NULL;
    dbus_uint32_t reply_val;

    dbus_error_init (&error);
    if (dbus_message_get_args 

      reply_message = dbus_message_new_method_return (message);
      if (!(sharename = smbparser_get_sharename(shares, path)))
	{
	  reply_val = 2;
	  daemon_log(LOG_ERR,"ShareRename Sharename path:%s not found\n", path);
	  dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
	}
      else
	{

	      /* FIXME strlen(sharename) et meme modele que ShareAdd */
	      if(authorized_section(sharename) == FALSE)
		{
		  reply_val = 1;
		  daemon_log(LOG_ERR,"ShareRename received, but error: authorized_section\n");
		  dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
		}
	      else
		if(find_sharename(shares,newname))
		  {
		    reply_val = 1;
		    daemon_log(LOG_ERR,"ShareRename Sharename already in used: %s\n", newname);
		    dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
		  }
		else
		  {
		    reply_val = 0;
		    daemon_log(LOG_ERR,"ShareRename Sharename not in used: %s\n", newname);
		    shares =   smbparser_rename_section(shares,sharename,newname);
		    dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
		  }
	    }
	}

      char	*name;
      char	*username;
      DBusMessage	*reply_message = NULL;
      dbus_uint32_t reply_val;

      dbus_error_init (&error);
      if (!dbus_message_get_args

      reply_message = dbus_message_new_method_return (message);
      if (name && (strlen(name) == 0))
	{
	  reply_val = 4;
	  daemon_log(LOG_ERR,"ShareAdd received, but error: strlen(name) == 0\n");
	  dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
	  goto exit;
	}
      if (!authorized_section(name))
	{
	  reply_val = 3;
	  daemon_log(LOG_ERR,"ShareAdd received, but error: authorized_section\n");
	  dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
	  goto exit;
	}
      if (!authorized_path(connection, path))
	{
	  reply_val = 2;
	  daemon_log(LOG_ERR,"ShareAdd received, but error: authorized_path\n");
	  dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
	  goto exit;
	}
      if(find_sharename(shares,name))
	{
	  reply_val = 1;
	  daemon_log(LOG_ERR,"ShareAdd Name already in used: %s\n", name);
	  dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
	  goto exit;
	}
      if(smbparser_get_sharename(shares, path))
	{
	  reply_val = 3;
	  daemon_log(LOG_ERR,"ShareAdd Path already in used: %s\n", path);
	  dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
	  goto exit;
	}
      if((username = get_nautilus_user(connection)))
	{
	  reply_val = 0;
	  daemon_log(LOG_INFO,"ShareAdd Name not in used: %s\n", name);
	  shares = smbparser_add_section(shares,name,username);
	  shares = smbparser_set_key(shares,name,"force user", username);
	  shares = smbparser_set_key(shares,name,"path",path);
	  dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
	}
    exit:
      dbus_free (name);

    DBusError	error;
    char	*sharename;
    DBusMessage	*reply_message = NULL;
    dbus_uint32_t reply_val;

    dbus_error_init (&error);
    if (dbus_message_get_args 

      
      if(authorized_section(sharename) == FALSE)
	{
	  reply_val = 1;
	  daemon_log(LOG_ERR,"SectionUsed received, but error: authorized_section\n");
	  dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
	}
      else
	if(find_sharename(shares,sharename))
	  {
	    reply_val = 1;
	    daemon_log(LOG_ERR,"SU Sharename already in used: %s\n", sharename);
	    dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
	  }
	else
	  {
	    reply_val = 0;
	    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)

      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)
	{
	  dbus_connection_send (connection, reply_message, NULL);

Return to bug 93400

Lines 59-66 smbparser_dbus_remove_key(DBusConnection Link Here

(-)src/smbparser-dbus-client.c (-26 / +26 lines)
59	return FALSE;	59	return FALSE;
60	message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "RemoveKey");	60	message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "RemoveKey");
61	dbus_message_append_args (message,	61	dbus_message_append_args (message,
62	DBUS_TYPE_STRING, section,	62	DBUS_TYPE_STRING, &section,
63	DBUS_TYPE_STRING, key,	63	DBUS_TYPE_STRING, &key,
64	DBUS_TYPE_INVALID);	64	DBUS_TYPE_INVALID);
65	dbus_connection_send (bus, message, NULL);	65	dbus_connection_send (bus, message, NULL);
66	dbus_message_unref (message);	66	dbus_message_unref (message);
Lines 77-85 smbparser_dbus_set_key(DBusConnection *b Link Here
77	return FALSE;	77	return FALSE;
78	message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "SetKey");	78	message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "SetKey");
79	dbus_message_append_args (message,	79	dbus_message_append_args (message,
80	DBUS_TYPE_STRING, path,	80	DBUS_TYPE_STRING, &path,
81	DBUS_TYPE_STRING, key,	81	DBUS_TYPE_STRING, &key,
82	DBUS_TYPE_STRING, value,	82	DBUS_TYPE_STRING, &value,
83	DBUS_TYPE_INVALID);	83	DBUS_TYPE_INVALID);
84	dbus_connection_send (bus, message, NULL);	84	dbus_connection_send (bus, message, NULL);
85	dbus_message_unref (message);	85	dbus_message_unref (message);
Lines 96-103 smbparser_dbus_share_remove_key(DBusConn Link Here
96	return FALSE;	96	return FALSE;
97	message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareRemoveKey");	97	message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareRemoveKey");
98	dbus_message_append_args (message,	98	dbus_message_append_args (message,
99	DBUS_TYPE_STRING, path,	99	DBUS_TYPE_STRING, &path,
100	DBUS_TYPE_STRING, key,	100	DBUS_TYPE_STRING, &key,
101	DBUS_TYPE_INVALID);	101	DBUS_TYPE_INVALID);
102	dbus_connection_send (bus, message, NULL);	102	dbus_connection_send (bus, message, NULL);
103	dbus_message_unref (message);	103	dbus_message_unref (message);
Lines 114-122 smbparser_dbus_share_set_key(DBusConnect Link Here
114	return FALSE;	114	return FALSE;
115	message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareSetKey");	115	message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareSetKey");
116	dbus_message_append_args (message,	116	dbus_message_append_args (message,
117	DBUS_TYPE_STRING, path,	117	DBUS_TYPE_STRING, &path,
118	DBUS_TYPE_STRING, key,	118	DBUS_TYPE_STRING, &key,
119	DBUS_TYPE_STRING, value,	119	DBUS_TYPE_STRING, &value,
120	DBUS_TYPE_INVALID);	120	DBUS_TYPE_INVALID);
121	dbus_connection_send (bus, message, NULL);	121	dbus_connection_send (bus, message, NULL);
122	dbus_message_unref (message);	122	dbus_message_unref (message);
Lines 133-139 smbparser_dbus_remove_section(DBusConnec Link Here
133	return FALSE;	133	return FALSE;
134	message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "RemoveSection");	134	message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "RemoveSection");
135	dbus_message_append_args (message,	135	dbus_message_append_args (message,
136	DBUS_TYPE_STRING, section,	136	DBUS_TYPE_STRING, &section,
137	DBUS_TYPE_INVALID);	137	DBUS_TYPE_INVALID);
138	dbus_connection_send (bus, message, NULL);	138	dbus_connection_send (bus, message, NULL);
139	dbus_message_unref (message);	139	dbus_message_unref (message);
Lines 150-156 smbparser_dbus_share_remove(DBusConnecti Link Here
150	return FALSE;	150	return FALSE;
151	message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareRemove");	151	message = dbus_message_new_signal (SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareRemove");
152	dbus_message_append_args (message,	152	dbus_message_append_args (message,
153	DBUS_TYPE_STRING, path,	153	DBUS_TYPE_STRING, &path,
154	DBUS_TYPE_INVALID);	154	DBUS_TYPE_INVALID);
155	dbus_connection_send (bus, message, NULL);	155	dbus_connection_send (bus, message, NULL);
156	dbus_message_unref (message);	156	dbus_message_unref (message);
Lines 171-178 smbparser_dbus_rename_section(DBusConnec Link Here
171	return FALSE;	171	return FALSE;
172	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "RenameSection");	172	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "RenameSection");
173	dbus_message_append_args (message,	173	dbus_message_append_args (message,
174	DBUS_TYPE_STRING, section,	174	DBUS_TYPE_STRING, &section,
175	DBUS_TYPE_STRING, newname,	175	DBUS_TYPE_STRING, &newname,
176	DBUS_TYPE_INVALID);	176	DBUS_TYPE_INVALID);
177		177
178	dbus_error_init (&error);	178	dbus_error_init (&error);
Lines 206-213 smbparser_dbus_share_rename(DBusConnecti Link Here
206	return FALSE;	206	return FALSE;
207	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareRename");	207	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareRename");
208	dbus_message_append_args (message,	208	dbus_message_append_args (message,
209	DBUS_TYPE_STRING, path,	209	DBUS_TYPE_STRING, &path,
210	DBUS_TYPE_STRING, newname,	210	DBUS_TYPE_STRING, &newname,
211	DBUS_TYPE_INVALID);	211	DBUS_TYPE_INVALID);
212		212
213	dbus_error_init (&error);	213	dbus_error_init (&error);
Lines 241-247 smbparser_dbus_add_section(DBusConnectio Link Here
241	return FALSE;	241	return FALSE;
242	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "AddSection");	242	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "AddSection");
243	dbus_message_append_args (message,	243	dbus_message_append_args (message,
244	DBUS_TYPE_STRING, section,	244	DBUS_TYPE_STRING, &section,
245	DBUS_TYPE_INVALID);	245	DBUS_TYPE_INVALID);
246	dbus_error_init (&error);	246	dbus_error_init (&error);
247	if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))	247	if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))
Lines 272-279 smbparser_dbus_share_add(DBusConnection Link Here
272	return FALSE;	272	return FALSE;
273	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareAdd");	273	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareAdd");
274	dbus_message_append_args (message,	274	dbus_message_append_args (message,
275	DBUS_TYPE_STRING, path,	275	DBUS_TYPE_STRING, &path,
276	DBUS_TYPE_STRING, name,	276	DBUS_TYPE_STRING, &name,
277	DBUS_TYPE_INVALID);	277	DBUS_TYPE_INVALID);
278	dbus_error_init (&error);	278	dbus_error_init (&error);
279	if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))	279	if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))
Lines 304-310 smbparser_dbus_section_used(DBusConnecti Link Here
304	return FALSE;	304	return FALSE;
305	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "SectionUsed");	305	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "SectionUsed");
306	dbus_message_append_args (message,	306	dbus_message_append_args (message,
307	DBUS_TYPE_STRING, section,	307	DBUS_TYPE_STRING, &section,
308	DBUS_TYPE_INVALID);	308	DBUS_TYPE_INVALID);
309	dbus_error_init (&error);	309	dbus_error_init (&error);
310	if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))	310	if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))
Lines 337-344 smbparser_dbus_get_key(DBusConnection *b Link Here
337		337
338	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "GetKey");	338	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "GetKey");
339	dbus_message_append_args (message,	339	dbus_message_append_args (message,
340	DBUS_TYPE_STRING, section,	340	DBUS_TYPE_STRING, &section,
341	DBUS_TYPE_STRING, key,	341	DBUS_TYPE_STRING, &key,
342	DBUS_TYPE_INVALID);	342	DBUS_TYPE_INVALID);
343	dbus_error_init (&error);	343	dbus_error_init (&error);
344	if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))	344	if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))
Lines 377-384 smbparser_dbus_share_get_key(DBusConnect Link Here
377		377
378	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareGetKey");	378	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH, SMBPARSER_DBUS_INTERFACE, "ShareGetKey");
379	dbus_message_append_args (message,	379	dbus_message_append_args (message,
380	DBUS_TYPE_STRING, path,	380	DBUS_TYPE_STRING, &path,
381	DBUS_TYPE_STRING, key,	381	DBUS_TYPE_STRING, &key,
382	DBUS_TYPE_INVALID);	382	DBUS_TYPE_INVALID);
383	dbus_error_init (&error);	383	dbus_error_init (&error);
384	if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))	384	if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))
Lines 415-421 smbparser_dbus_share_get_name(DBusConnec Link Here
415	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH,	415	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH,
416	SMBPARSER_DBUS_INTERFACE, "ShareGetName");	416	SMBPARSER_DBUS_INTERFACE, "ShareGetName");
417	dbus_message_append_args (message,	417	dbus_message_append_args (message,
418	DBUS_TYPE_STRING, path,	418	DBUS_TYPE_STRING, &path,
419	DBUS_TYPE_INVALID);	419	DBUS_TYPE_INVALID);
420		420
421	dbus_error_init (&error);	421	dbus_error_init (&error);
Lines 453-459 smbparser_dbus_share_is_writable(DBusCon Link Here
453	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH,	453	message = dbus_message_new_method_call (SMBPARSER_DBUS_SRV, SMBPARSER_DBUS_PATH,
454	SMBPARSER_DBUS_INTERFACE, "ShareIsWritable");	454	SMBPARSER_DBUS_INTERFACE, "ShareIsWritable");
455	dbus_message_append_args (message,	455	dbus_message_append_args (message,
456	DBUS_TYPE_STRING, path,	456	DBUS_TYPE_STRING, &path,
457	DBUS_TYPE_INVALID);	457	DBUS_TYPE_INVALID);
458	dbus_error_init (&error);	458	dbus_error_init (&error);
459	if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))	459	if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error)))

Lines 195-208 path_message_func (DBusConnection *conn Link Here

(-)src/smbparser-dbus-server.c (-18 / +36 lines)
195	if((sharename = smbparser_get_sharename(shares, path)))	195	if((sharename = smbparser_get_sharename(shares, path)))
196	{	196	{
197	value = smbparser_get_key(shares,sharename,key);	197	value = smbparser_get_key(shares,sharename,key);
		198	if (!value)
		199	value = "";
198	daemon_log(LOG_INFO,"Share Get key %s in section %s -> %s\n", key, sharename,value);	200	daemon_log(LOG_INFO,"Share Get key %s in section %s -> %s\n", key, sharename,value);
199	dbus_message_append_args (reply_message, DBUS_TYPE_STRING, value?value:"", DBUS_TYPE_INVALID);
200	}	201	}
201	else	202	else
202	{	203	{
203	daemon_log(LOG_ERR,"Share Get key path: %s not found\n",path);	204	daemon_log(LOG_ERR,"Share Get key path: %s not found\n",path);
204	dbus_message_append_args (reply_message, DBUS_TYPE_STRING, "", DBUS_TYPE_INVALID);	205	value = "";
205	}	206	}
		207	dbus_message_append_args (reply_message, DBUS_TYPE_STRING, &value, DBUS_TYPE_INVALID);
206	dbus_free (path);	208	dbus_free (path);
207	dbus_free (key);	209	dbus_free (key);
208	if (reply_message)	210	if (reply_message)
Lines 235-247 path_message_func (DBusConnection *conn Link Here
235	if (!(sharename = smbparser_get_sharename(shares, path)))	237	if (!(sharename = smbparser_get_sharename(shares, path)))
236	{	238	{
237	daemon_log(LOG_ERR,"SGN Sharename path:%s not found\n", path);	239	daemon_log(LOG_ERR,"SGN Sharename path:%s not found\n", path);
238	dbus_message_append_args (reply_message, DBUS_TYPE_STRING, "", DBUS_TYPE_INVALID);	240	sharename = "";
239	}	241	}
240	else	242	else
241	{	243	{
242	daemon_log(LOG_INFO,"Path %s is sharename %s\n", path, sharename);	244	daemon_log(LOG_INFO,"Path %s is sharename %s\n", path, sharename);
243	dbus_message_append_args (reply_message, DBUS_TYPE_STRING, sharename, DBUS_TYPE_INVALID);
244	}	245	}
		246	dbus_message_append_args (reply_message, DBUS_TYPE_STRING, &sharename, DBUS_TYPE_INVALID);
245	dbus_free (path);	247	dbus_free (path);
246	if (reply_message)	248	if (reply_message)
247	{	249	{
Lines 264-269 path_message_func (DBusConnection *conn Link Here
264	char *sharename;	266	char *sharename;
265	char *newname;	267	char *newname;
266	DBusMessage *reply_message = NULL;	268	DBusMessage *reply_message = NULL;
		269	dbus_uint32_t reply_val;
267		270
268	dbus_error_init (&error);	271	dbus_error_init (&error);
269	if (dbus_message_get_args	272	if (dbus_message_get_args
Lines 274-281 path_message_func (DBusConnection *conn Link Here
274	reply_message = dbus_message_new_method_return (message);	277	reply_message = dbus_message_new_method_return (message);
275	if (!(sharename = smbparser_get_sharename(shares, path)))	278	if (!(sharename = smbparser_get_sharename(shares, path)))
276	{	279	{
		280	reply_val = 2;
277	daemon_log(LOG_ERR,"ShareRename Sharename path:%s not found\n", path);	281	daemon_log(LOG_ERR,"ShareRename Sharename path:%s not found\n", path);
278	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, 2, DBUS_TYPE_INVALID);	282	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
279	}	283	}
280	else	284	else
281	{	285	{
Lines 285-304 path_message_func (DBusConnection *conn Link Here
285	/* FIXME strlen(sharename) et meme modele que ShareAdd */	289	/* FIXME strlen(sharename) et meme modele que ShareAdd */
286	if(authorized_section(sharename) == FALSE)	290	if(authorized_section(sharename) == FALSE)
287	{	291	{
		292	reply_val = 1;
288	daemon_log(LOG_ERR,"ShareRename received, but error: authorized_section\n");	293	daemon_log(LOG_ERR,"ShareRename received, but error: authorized_section\n");
289	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, 1, DBUS_TYPE_INVALID);	294	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
290	}	295	}
291	else	296	else
292	if(find_sharename(shares,newname))	297	if(find_sharename(shares,newname))
293	{	298	{
		299	reply_val = 1;
294	daemon_log(LOG_ERR,"ShareRename Sharename already in used: %s\n", newname);	300	daemon_log(LOG_ERR,"ShareRename Sharename already in used: %s\n", newname);
295	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, 1, DBUS_TYPE_INVALID);	301	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
296	}	302	}
297	else	303	else
298	{	304	{
		305	reply_val = 0;
299	daemon_log(LOG_ERR,"ShareRename Sharename not in used: %s\n", newname);	306	daemon_log(LOG_ERR,"ShareRename Sharename not in used: %s\n", newname);
300	shares = smbparser_rename_section(shares,sharename,newname);	307	shares = smbparser_rename_section(shares,sharename,newname);
301	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, 0, DBUS_TYPE_INVALID);	308	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
302	}	309	}
303	}	310	}
304	}	311	}
Lines 325-330 path_message_func (DBusConnection *conn Link Here
325	char *name;	332	char *name;
326	char *username;	333	char *username;
327	DBusMessage *reply_message = NULL;	334	DBusMessage *reply_message = NULL;
		335	dbus_uint32_t reply_val;
328		336
329	dbus_error_init (&error);	337	dbus_error_init (&error);
330	if (!dbus_message_get_args	338	if (!dbus_message_get_args
Lines 341-381 path_message_func (DBusConnection *conn Link Here
341	reply_message = dbus_message_new_method_return (message);	349	reply_message = dbus_message_new_method_return (message);
342	if (name && (strlen(name) == 0))	350	if (name && (strlen(name) == 0))
343	{	351	{
		352	reply_val = 4;
344	daemon_log(LOG_ERR,"ShareAdd received, but error: strlen(name) == 0\n");	353	daemon_log(LOG_ERR,"ShareAdd received, but error: strlen(name) == 0\n");
345	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, 4, DBUS_TYPE_INVALID);	354	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
346	goto exit;	355	goto exit;
347	}	356	}
348	if (!authorized_section(name))	357	if (!authorized_section(name))
349	{	358	{
		359	reply_val = 3;
350	daemon_log(LOG_ERR,"ShareAdd received, but error: authorized_section\n");	360	daemon_log(LOG_ERR,"ShareAdd received, but error: authorized_section\n");
351	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, 3, DBUS_TYPE_INVALID);	361	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
352	goto exit;	362	goto exit;
353	}	363	}
354	if (!authorized_path(connection, path))	364	if (!authorized_path(connection, path))
355	{	365	{
		366	reply_val = 2;
356	daemon_log(LOG_ERR,"ShareAdd received, but error: authorized_path\n");	367	daemon_log(LOG_ERR,"ShareAdd received, but error: authorized_path\n");
357	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, 2, DBUS_TYPE_INVALID);	368	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
358	goto exit;	369	goto exit;
359	}	370	}
360	if(find_sharename(shares,name))	371	if(find_sharename(shares,name))
361	{	372	{
		373	reply_val = 1;
362	daemon_log(LOG_ERR,"ShareAdd Name already in used: %s\n", name);	374	daemon_log(LOG_ERR,"ShareAdd Name already in used: %s\n", name);
363	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, 1, DBUS_TYPE_INVALID);	375	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
364	goto exit;	376	goto exit;
365	}	377	}
366	if(smbparser_get_sharename(shares, path))	378	if(smbparser_get_sharename(shares, path))
367	{	379	{
		380	reply_val = 3;
368	daemon_log(LOG_ERR,"ShareAdd Path already in used: %s\n", path);	381	daemon_log(LOG_ERR,"ShareAdd Path already in used: %s\n", path);
369	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, 3, DBUS_TYPE_INVALID);	382	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
370	goto exit;	383	goto exit;
371	}	384	}
372	if((username = get_nautilus_user(connection)))	385	if((username = get_nautilus_user(connection)))
373	{	386	{
		387	reply_val = 0;
374	daemon_log(LOG_INFO,"ShareAdd Name not in used: %s\n", name);	388	daemon_log(LOG_INFO,"ShareAdd Name not in used: %s\n", name);
375	shares = smbparser_add_section(shares,name,username);	389	shares = smbparser_add_section(shares,name,username);
376	shares = smbparser_set_key(shares,name,"force user", username);	390	shares = smbparser_set_key(shares,name,"force user", username);
377	shares = smbparser_set_key(shares,name,"path",path);	391	shares = smbparser_set_key(shares,name,"path",path);
378	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, 0, DBUS_TYPE_INVALID);	392	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
379	}	393	}
380	exit:	394	exit:
381	dbus_free (name);	395	dbus_free (name);
Lines 396-401 path_message_func (DBusConnection *conn Link Here
396	DBusError error;	410	DBusError error;
397	char *sharename;	411	char *sharename;
398	DBusMessage *reply_message = NULL;	412	DBusMessage *reply_message = NULL;
		413	dbus_uint32_t reply_val;
399		414
400	dbus_error_init (&error);	415	dbus_error_init (&error);
401	if (dbus_message_get_args	416	if (dbus_message_get_args
Lines 407-425 path_message_func (DBusConnection *conn Link Here
407		422
408	if(authorized_section(sharename) == FALSE)	423	if(authorized_section(sharename) == FALSE)
409	{	424	{
		425	reply_val = 1;
410	daemon_log(LOG_ERR,"SectionUsed received, but error: authorized_section\n");	426	daemon_log(LOG_ERR,"SectionUsed received, but error: authorized_section\n");
411	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, 1, DBUS_TYPE_INVALID);	427	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
412	}	428	}
413	else	429	else
414	if(find_sharename(shares,sharename))	430	if(find_sharename(shares,sharename))
415	{	431	{
		432	reply_val = 1;
416	daemon_log(LOG_ERR,"SU Sharename already in used: %s\n", sharename);	433	daemon_log(LOG_ERR,"SU Sharename already in used: %s\n", sharename);
417	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, 1, DBUS_TYPE_INVALID);	434	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
418	}	435	}
419	else	436	else
420	{	437	{
		438	reply_val = 0;
421	daemon_log(LOG_INFO,"SU Sharename not in used: %s\n", sharename);	439	daemon_log(LOG_INFO,"SU Sharename not in used: %s\n", sharename);
422	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, 0, DBUS_TYPE_INVALID);	440	dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID);
423	}	441	}
424	dbus_free (sharename);	442	dbus_free (sharename);
425	if (reply_message)	443	if (reply_message)
Lines 452-458 path_message_func (DBusConnection *conn Link Here
452	daemon_log(LOG_INFO,"Path %s -> %d\n", path, writable);	470	daemon_log(LOG_INFO,"Path %s -> %d\n", path, writable);
453	dbus_free (path);	471	dbus_free (path);
454	reply_message = dbus_message_new_method_return (message);	472	reply_message = dbus_message_new_method_return (message);
455	dbus_message_append_args (reply_message, DBUS_TYPE_BOOLEAN, writable, DBUS_TYPE_INVALID);	473	dbus_message_append_args (reply_message, DBUS_TYPE_BOOLEAN, &writable, DBUS_TYPE_INVALID);
456	if (reply_message)	474	if (reply_message)
457	{	475	{
458	dbus_connection_send (connection, reply_message, NULL);	476	dbus_connection_send (connection, reply_message, NULL);