summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/client/tree.c28
-rw-r--r--source3/libsmb/libsmbclient.c40
2 files changed, 63 insertions, 5 deletions
diff --git a/source3/client/tree.c b/source3/client/tree.c
index fca86185bf..77f882f193 100644
--- a/source3/client/tree.c
+++ b/source3/client/tree.c
@@ -35,7 +35,7 @@ static void cb_itemsignal( GtkWidget *item,
GtkWidget *real_tree, *aitem, *subtree;
gchar *name;
GtkLabel *label;
- gint dh, err, dirlen;
+ gint dh, err, dirlen, level;
char dirbuf[512];
struct smbc_dirent *dirp;
@@ -44,15 +44,31 @@ static void cb_itemsignal( GtkWidget *item,
label = GTK_LABEL (GTK_BIN (item)->child);
/* Get the text of the label */
gtk_label_get (label, &name);
+
+ level = GTK_TREE(item->parent)->level;
+
/* Get the level of the tree which the item is in */
g_print ("%s called for item %s->%p, level %d\n", signame, name,
item, GTK_TREE (item->parent)->level);
if (strncmp(signame, "expand", 6) == 0) { /* Expand called */
-
char server[128];
- slprintf(server, 128, "smb://%s", name);
+ if (level>0) {
+ gchar *sname;
+ GtkLabel *l2;
+ GtkWidget *p = GTK_WIDGET(item->parent);
+
+ p = GTK_TREE(p)->tree_owner;
+
+ l2 = GTK_LABEL(GTK_BIN(p)->child);
+
+ gtk_label_get(l2, &sname);
+ slprintf(server, 128, "smb://%s/%s", sname, name);
+
+ }
+ else
+ slprintf(server, 128, "smb://%s", name);
if ((dh = smbc_opendir(server)) < 0) { /* Handle error */
@@ -232,7 +248,7 @@ static void cb_wholenet(GtkWidget *item, gchar *signame)
GTK_SIGNAL_FUNC(cb_itemsignal), "expand");
gtk_signal_connect (GTK_OBJECT(aitem), "collapse",
GTK_SIGNAL_FUNC(cb_itemsignal), "collapse");
- /* Add it to the parent tree */
+
gtk_tree_append (GTK_TREE(real_tree), aitem);
/* Show it - this can be done at any time */
gtk_widget_show (aitem);
@@ -309,7 +325,9 @@ auth_fn(char *server, char *share,
char **workgroup, char **username, char **password)
{
- /* Do nothing for now ... */
+ *workgroup = "";
+ *username = "test";
+ *password = "test";
}
diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index 50d330e363..960fa1d3da 100644
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -1241,6 +1241,19 @@ list_fn(const char *name, uint32 type, const char *comment, void *state)
}
+static void
+dir_list_fn(file_info *finfo, const char *mask, void *state)
+{
+
+ fprintf(stderr, "Finfo->name=%s, mask=%s\n", finfo->name, mask);
+ if (add_dirent((struct smbc_file *)state, finfo->name, "", SMBC_FILE) < 0) {
+
+ /* Handle an error ... */
+
+ }
+
+}
+
int smbc_opendir(const char *fname)
{
struct in_addr addr;
@@ -1447,8 +1460,35 @@ int smbc_opendir(const char *fname)
}
else { /* The server and share are specified ... work from there ... */
+ /* Well, we connect to the server and list the directory */
+
+ smbc_file_table[slot]->dir_type = SMBC_FILE_SHARE;
+
+ srv = smbc_server(server, share);
+ if (!srv) {
+ if (smbc_file_table[slot]) free(smbc_file_table[slot]);
+ smbc_file_table[slot] = NULL;
+ return -1;
+
+ }
+
+ smbc_file_table[slot]->srv = srv;
+
+ /* Now, list the files ... */
+
+ pstrcat(path, "\\*");
+
+ if (!cli_list(&srv->cli, path, aDIR | aSYSTEM | aHIDDEN, dir_list_fn,
+ (void *)smbc_file_table[slot])) {
+
+ if (smbc_file_table[slot]) free(smbc_file_table[slot]);
+ smbc_file_table[slot] = NULL;
+ errno = smbc_errno(&srv->cli);
+ return -1;
+
+ }
}
}