--- src/smbparser-dbus-client.c 2005/05/21 02:08:11 1.1 +++ src/smbparser-dbus-client.c 2005/05/21 02:10:15 @@ -59,8 +59,8 @@ smbparser_dbus_remove_key(DBusConnection 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_STRING, §ion, + DBUS_TYPE_STRING, &key, DBUS_TYPE_INVALID); dbus_connection_send (bus, message, NULL); dbus_message_unref (message); @@ -77,9 +77,9 @@ smbparser_dbus_set_key(DBusConnection *b 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_STRING, &path, + DBUS_TYPE_STRING, &key, + DBUS_TYPE_STRING, &value, DBUS_TYPE_INVALID); dbus_connection_send (bus, message, NULL); dbus_message_unref (message); @@ -96,8 +96,8 @@ smbparser_dbus_share_remove_key(DBusConn 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_STRING, &path, + DBUS_TYPE_STRING, &key, DBUS_TYPE_INVALID); dbus_connection_send (bus, message, NULL); dbus_message_unref (message); @@ -114,9 +114,9 @@ smbparser_dbus_share_set_key(DBusConnect 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_STRING, &path, + DBUS_TYPE_STRING, &key, + DBUS_TYPE_STRING, &value, DBUS_TYPE_INVALID); dbus_connection_send (bus, message, NULL); dbus_message_unref (message); @@ -133,7 +133,7 @@ smbparser_dbus_remove_section(DBusConnec 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_STRING, §ion, DBUS_TYPE_INVALID); dbus_connection_send (bus, message, NULL); dbus_message_unref (message); @@ -150,7 +150,7 @@ smbparser_dbus_share_remove(DBusConnecti 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_STRING, &path, DBUS_TYPE_INVALID); dbus_connection_send (bus, message, NULL); dbus_message_unref (message); @@ -171,8 +171,8 @@ smbparser_dbus_rename_section(DBusConnec 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_STRING, §ion, + DBUS_TYPE_STRING, &newname, DBUS_TYPE_INVALID); dbus_error_init (&error); @@ -206,8 +206,8 @@ smbparser_dbus_share_rename(DBusConnecti 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_STRING, &path, + DBUS_TYPE_STRING, &newname, DBUS_TYPE_INVALID); dbus_error_init (&error); @@ -241,7 +241,7 @@ smbparser_dbus_add_section(DBusConnectio 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_STRING, §ion, DBUS_TYPE_INVALID); dbus_error_init (&error); if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error))) @@ -272,8 +272,8 @@ smbparser_dbus_share_add(DBusConnection 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_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))) @@ -304,7 +304,7 @@ smbparser_dbus_section_used(DBusConnecti 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_STRING, §ion, DBUS_TYPE_INVALID); dbus_error_init (&error); if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error))) @@ -337,8 +337,8 @@ smbparser_dbus_get_key(DBusConnection *b 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_STRING, §ion, + DBUS_TYPE_STRING, &key, DBUS_TYPE_INVALID); dbus_error_init (&error); if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error))) @@ -377,8 +377,8 @@ smbparser_dbus_share_get_key(DBusConnect 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_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))) @@ -415,7 +415,7 @@ smbparser_dbus_share_get_name(DBusConnec 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_STRING, &path, DBUS_TYPE_INVALID); dbus_error_init (&error); @@ -453,7 +453,7 @@ smbparser_dbus_share_is_writable(DBusCon 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_STRING, &path, DBUS_TYPE_INVALID); dbus_error_init (&error); if((reply = dbus_connection_send_with_reply_and_block (bus, message, -1, &error))) --- src/smbparser-dbus-server.c 2005/05/21 02:10:35 1.1 +++ src/smbparser-dbus-server.c 2005/05/21 02:25:57 @@ -195,14 +195,16 @@ path_message_func (DBusConnection *conn 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); - dbus_message_append_args (reply_message, DBUS_TYPE_STRING, "", DBUS_TYPE_INVALID); + value = ""; } + dbus_message_append_args (reply_message, DBUS_TYPE_STRING, &value, DBUS_TYPE_INVALID); dbus_free (path); dbus_free (key); if (reply_message) @@ -235,13 +237,13 @@ path_message_func (DBusConnection *conn if (!(sharename = smbparser_get_sharename(shares, path))) { daemon_log(LOG_ERR,"SGN Sharename path:%s not found\n", path); - dbus_message_append_args (reply_message, DBUS_TYPE_STRING, "", DBUS_TYPE_INVALID); + 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) { @@ -264,6 +266,7 @@ path_message_func (DBusConnection *conn char *sharename; char *newname; DBusMessage *reply_message = NULL; + dbus_uint32_t reply_val; dbus_error_init (&error); if (dbus_message_get_args @@ -274,8 +277,9 @@ path_message_func (DBusConnection *conn 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, 2, DBUS_TYPE_INVALID); + dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID); } else { @@ -285,20 +289,23 @@ path_message_func (DBusConnection *conn /* 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, 1, DBUS_TYPE_INVALID); + 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, 1, DBUS_TYPE_INVALID); + 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, 0, DBUS_TYPE_INVALID); + dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID); } } } @@ -325,6 +332,7 @@ path_message_func (DBusConnection *conn char *name; char *username; DBusMessage *reply_message = NULL; + dbus_uint32_t reply_val; dbus_error_init (&error); if (!dbus_message_get_args @@ -341,41 +349,47 @@ path_message_func (DBusConnection *conn 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, 4, DBUS_TYPE_INVALID); + 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, 3, DBUS_TYPE_INVALID); + 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, 2, DBUS_TYPE_INVALID); + 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, 1, DBUS_TYPE_INVALID); + 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, 3, DBUS_TYPE_INVALID); + 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, 0, DBUS_TYPE_INVALID); + dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID); } exit: dbus_free (name); @@ -396,6 +410,7 @@ path_message_func (DBusConnection *conn DBusError error; char *sharename; DBusMessage *reply_message = NULL; + dbus_uint32_t reply_val; dbus_error_init (&error); if (dbus_message_get_args @@ -407,19 +422,22 @@ path_message_func (DBusConnection *conn 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, 1, DBUS_TYPE_INVALID); + 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, 1, DBUS_TYPE_INVALID); + 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, 0, DBUS_TYPE_INVALID); + dbus_message_append_args (reply_message, DBUS_TYPE_UINT32, &reply_val, DBUS_TYPE_INVALID); } dbus_free (sharename); if (reply_message) @@ -452,7 +470,7 @@ path_message_func (DBusConnection *conn 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); + dbus_message_append_args (reply_message, DBUS_TYPE_BOOLEAN, &writable, DBUS_TYPE_INVALID); if (reply_message) { dbus_connection_send (connection, reply_message, NULL);