The branch, master has been updated via 3c50a921aec s3:client: Remove unused tree.c via ba4c322ac78 s3:libsmb: Also deprecate smbc_init() via 092a6a62e1f s3:utils: Use smbc_set_credentials_with_fallback() for smbget via c44109142a6 s3:libsmb: Mark smbc_set_credentials() as deprecated from 9eb44306623 s3:lib: Do not try to match '.' and '..' directories in is_in_path()
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 3c50a921aec1b25c0247cc8639714a2a0933a01f Author: Andreas Schneider <a...@samba.org> Date: Thu Apr 20 13:02:05 2023 +0200 s3:client: Remove unused tree.c Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Thu Apr 20 12:56:53 UTC 2023 on atb-devel-224 commit ba4c322ac7877824e23856396a82123843162870 Author: Andreas Schneider <a...@samba.org> Date: Tue Apr 18 16:00:51 2023 +0200 s3:libsmb: Also deprecate smbc_init() Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit 092a6a62e1f568543a01a48e193ef0acebf47caa Author: Andreas Schneider <a...@samba.org> Date: Thu Apr 13 15:41:53 2023 +0200 s3:utils: Use smbc_set_credentials_with_fallback() for smbget smbc_set_credentials() is deprecated. Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> commit c44109142a63b2b650f180fcf5737ffa22ef1d26 Author: Andreas Schneider <a...@samba.org> Date: Thu Apr 13 15:31:04 2023 +0200 s3:libsmb: Mark smbc_set_credentials() as deprecated This will issue a compiler warning! Signed-off-by: Andreas Schneider <a...@samba.org> Reviewed-by: Pavel Filipenský <pfilipen...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/client/tree.c | 812 ----------------------------------------- source3/include/libsmbclient.h | 56 +-- source3/utils/smbget.c | 103 +++--- 3 files changed, 80 insertions(+), 891 deletions(-) delete mode 100644 source3/client/tree.c Changeset truncated at 500 lines: diff --git a/source3/client/tree.c b/source3/client/tree.c deleted file mode 100644 index 0e51f6105b9..00000000000 --- a/source3/client/tree.c +++ /dev/null @@ -1,812 +0,0 @@ -/* - Unix SMB/CIFS implementation. - SMB client GTK+ tree-based application - Copyright (C) Andrew Tridgell 1998 - Copyright (C) Richard Sharpe 2001 - Copyright (C) John Terpstra 2001 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ - -/* example-gtk+ application, ripped off from the gtk+ tree.c sample */ - -#include <stdio.h> -#include <errno.h> -#include <gtk/gtk.h> -#include "libsmbclient.h" - -static GtkWidget *clist; - -struct tree_data { - - guint32_t type; /* Type of tree item, an SMBC_TYPE */ - char name[256]; /* May need to change this later */ - -}; - -static void tree_error_message(gchar *message) { - - GtkWidget *dialog, *label, *okay_button; - - /* Create the widgets */ - - dialog = gtk_dialog_new(); - gtk_window_set_modal(GTK_WINDOW(dialog), True); - label = gtk_label_new (message); - okay_button = gtk_button_new_with_label("Okay"); - - /* Ensure that the dialog box is destroyed when the user clicks ok. */ - - gtk_signal_connect_object (GTK_OBJECT (okay_button), "clicked", - GTK_SIGNAL_FUNC (gtk_widget_destroy), dialog); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->action_area), - okay_button); - - /* Add the label, and show everything we've added to the dialog. */ - - gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), - label); - gtk_widget_show_all (dialog); -} - -/* - * We are given a widget, and we want to retrieve its URL so we - * can do a directory listing. - * - * We walk back up the tree, picking up pieces until we hit a server or - * workgroup type and return a path from there - */ - -static char *path_string; - -char *get_path(TALLOC_CTX *ctx, GtkWidget *item) -{ - GtkWidget *p = item; - struct tree_data *pd; - char *comps[1024]; /* We keep pointers to the components here */ - int i = 0, j, level,type; - - /* Walk back up the tree, getting the private data */ - - level = GTK_TREE(item->parent)->level; - - /* Pick up this item's component info */ - - pd = (struct tree_data *)gtk_object_get_user_data(GTK_OBJECT(item)); - - comps[i++] = pd->name; - type = pd->type; - - while (level > 0 && type != SMBC_SERVER && type != SMBC_WORKGROUP) { - - /* Find the parent and extract the data etc ... */ - - p = GTK_WIDGET(p->parent); - p = GTK_WIDGET(GTK_TREE(p)->tree_owner); - - pd = (struct tree_data *)gtk_object_get_user_data(GTK_OBJECT(p)); - - level = GTK_TREE(item->parent)->level; - - comps[i++] = pd->name; - type = pd->type; - - } - - /* - * Got a list of comps now, should check that we did not hit a workgroup - * when we got other things as well ... Later - * - * Now, build the path - */ - - TALLOC_FREE(path_string); - path_string = talloc_strdup(ctx, "smb:/"); - - if (path_string) { - for (j = i - 1; j >= 0; j--) { - path_string = talloc_asprintf_append(path_string, "/%s", comps[j]); - } - } - - if (path_string) { - fprintf(stdout, "Path string = %s\n", path_string); - } - - return path_string; - -} - -struct tree_data *make_tree_data(guint32_t type, const char *name) -{ - struct tree_data *p = SMB_MALLOC_P(struct tree_data); - - if (p) { - - p->type = type; - strncpy(p->name, name, sizeof(p->name)); - - } - - return p; - -} - -/* Note that this is called every time the user clicks on an item, - whether it is already selected or not. */ -static void cb_select_child (GtkWidget *root_tree, GtkWidget *child, - GtkWidget *subtree) -{ - gint dh, err, dirlen; - char dirbuf[512]; - struct smbc_dirent *dirp; - struct stat st1; - char *path; - TALLOC_CTX *ctx = talloc_stackframe(); - - g_print ("select_child called for root tree %p, subtree %p, child %p\n", - root_tree, subtree, child); - - /* Now, figure out what it is, and display it in the clist ... */ - - gtk_clist_clear(GTK_CLIST(clist)); /* Clear the CLIST */ - - /* Now, get the private data for the subtree */ - - path = get_path(ctx, child); - if (!path) { - gtk_main_quit(); - TALLOC_FREE(ctx); - return; - } - - if ((dh = smbc_opendir(path)) < 0) { /* Handle error */ - g_print("cb_select_child: Could not open dir %s, %s\n", path, - strerror(errno)); - gtk_main_quit(); - TALLOC_FREE(ctx); - return; - } - - while ((err = smbc_getdents(dh, (struct smbc_dirent *)dirbuf, - sizeof(dirbuf))) != 0) { - if (err < 0) { - g_print("cb_select_child: Could not read dir %s, %s\n", path, - strerror(errno)); - gtk_main_quit(); - TALLOC_FREE(ctx); - return; - } - - dirp = (struct smbc_dirent *)dirbuf; - - while (err > 0) { - gchar col1[128], col2[128], col3[128], col4[128]; - gchar *rowdata[4] = {col1, col2, col3, col4}; - - dirlen = dirp->dirlen; - - /* Format each of the items ... */ - - strncpy(col1, dirp->name, 128); - - col2[0] = col3[0] = col4[0] = (char)0; - - switch (dirp->smbc_type) { - - case SMBC_WORKGROUP: - - break; - - case SMBC_SERVER: - - strncpy(col2, (dirp->comment?dirp->comment:""), 128); - - break; - - case SMBC_FILE_SHARE: - - strncpy(col2, (dirp->comment?dirp->comment:""), 128); - - break; - - case SMBC_PRINTER_SHARE: - - strncpy(col2, (dirp->comment?dirp->comment:""), 128); - break; - - case SMBC_COMMS_SHARE: - - break; - - case SMBC_IPC_SHARE: - - break; - - case SMBC_DIR: - case SMBC_FILE: - - /* Get stats on the file/dir and see what we have */ - - if ((strcmp(dirp->name, ".") != 0) && - (strcmp(dirp->name, "..") != 0)) { - char *path1; - - path1 = talloc_asprintf(ctx, - "%s/%s", - path, - dirp->name); - if (!path1) { - gtk_main_quit(); - TALLOC_FREE(ctx); - return; - } - - if (smbc_stat(path1, &st1) < 0) { - if (errno != EBUSY) { - g_print("cb_select_child: Could not stat file %s, %s\n", path1, - strerror(errno)); - gtk_main_quit(); - TALLOC_FREE(ctx); - return; - } else { - strncpy(col2, "Device or resource busy", sizeof(col2)); - } - } - else { - /* Now format each of the relevant things ... */ - - snprintf(col2, sizeof(col2), "%c%c%c%c%c%c%c%c%c(%0X)", - (st1.st_mode&S_IRUSR?'r':'-'), - (st1.st_mode&S_IWUSR?'w':'-'), - (st1.st_mode&S_IXUSR?'x':'-'), - (st1.st_mode&S_IRGRP?'r':'-'), - (st1.st_mode&S_IWGRP?'w':'-'), - (st1.st_mode&S_IXGRP?'x':'-'), - (st1.st_mode&S_IROTH?'r':'-'), - (st1.st_mode&S_IWOTH?'w':'-'), - (st1.st_mode&S_IXOTH?'x':'-'), - st1.st_mode); - snprintf(col3, sizeof(col3), "%u", st1.st_size); - snprintf(col4, sizeof(col4), "%s", ctime(&st1.st_mtime)); - } - } - - break; - - default: - - break; - } - - gtk_clist_append(GTK_CLIST(clist), rowdata); - - (char *)dirp += dirlen; - err -= dirlen; - - } - } - TALLOC_FREE(ctx); -} - -/* Note that this is never called */ -static void cb_unselect_child( GtkWidget *root_tree, - GtkWidget *child, - GtkWidget *subtree ) -{ - g_print ("unselect_child called for root tree %p, subtree %p, child %p\n", - root_tree, subtree, child); -} - -/* for all the GtkItem:: and GtkTreeItem:: signals */ -static void cb_itemsignal( GtkWidget *item, - gchar *signame ) -{ - GtkWidget *real_tree, *aitem, *subtree; - gchar *name; - GtkLabel *label; - gint dh, err, dirlen, level; - char dirbuf[512]; - struct smbc_dirent *dirp; - - 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); - - real_tree = GTK_TREE_ITEM_SUBTREE(item); /* Get the subtree */ - - if (strncmp(signame, "expand", 6) == 0) { /* Expand called */ - char server[128]; - - if ((dh = smbc_opendir(get_path(item))) < 0) { /* Handle error */ - gchar errmsg[256]; - - g_print("cb_itemsignal: Could not open dir %s, %s\n", get_path(item), - strerror(errno)); - - slprintf(errmsg, sizeof(errmsg), "cb_itemsignal: Could not open dir %s, %s\n", get_path(item), strerror(errno)); - - tree_error_message(errmsg); - - /* gtk_main_quit();*/ - - return; - - } - - while ((err = smbc_getdents(dh, (struct smbc_dirent *)dirbuf, - sizeof(dirbuf))) != 0) { - - if (err < 0) { /* An error, report it */ - gchar errmsg[256]; - - g_print("cb_itemsignal: Could not read dir smbc://, %s\n", - strerror(errno)); - - slprintf(errmsg, sizeof(errmsg), "cb_itemsignal: Could not read dir smbc://, %s\n", strerror(errno)); - - tree_error_message(errmsg); - - /* gtk_main_quit();*/ - - return; - - } - - dirp = (struct smbc_dirent *)dirbuf; - - while (err > 0) { - struct tree_data *my_data; - - dirlen = dirp->dirlen; - - my_data = make_tree_data(dirp->smbc_type, dirp->name); - - if (!my_data) { - - g_print("Could not allocate space for tree_data: %s\n", - dirp->name); - - gtk_main_quit(); - return; - - } - - aitem = gtk_tree_item_new_with_label(dirp->name); - - /* Connect all GtkItem:: and GtkTreeItem:: signals */ - gtk_signal_connect (GTK_OBJECT(aitem), "select", - GTK_SIGNAL_FUNC(cb_itemsignal), "select"); - gtk_signal_connect (GTK_OBJECT(aitem), "deselect", - GTK_SIGNAL_FUNC(cb_itemsignal), "deselect"); - gtk_signal_connect (GTK_OBJECT(aitem), "toggle", - GTK_SIGNAL_FUNC(cb_itemsignal), "toggle"); - gtk_signal_connect (GTK_OBJECT(aitem), "expand", - 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); - - gtk_widget_show (aitem); - - gtk_object_set_user_data(GTK_OBJECT(aitem), (gpointer)my_data); - - fprintf(stdout, "Added: %s, len: %u\n", dirp->name, dirlen); - - if (dirp->smbc_type != SMBC_FILE && - dirp->smbc_type != SMBC_IPC_SHARE && - (strcmp(dirp->name, ".") != 0) && - (strcmp(dirp->name, "..") !=0)){ - - subtree = gtk_tree_new(); - gtk_tree_item_set_subtree(GTK_TREE_ITEM(aitem), subtree); - - gtk_signal_connect(GTK_OBJECT(subtree), "select_child", - GTK_SIGNAL_FUNC(cb_select_child), real_tree); - gtk_signal_connect(GTK_OBJECT(subtree), "unselect_child", - GTK_SIGNAL_FUNC(cb_unselect_child), real_tree); - - } - - (char *)dirp += dirlen; - err -= dirlen; - - } - - } - - smbc_closedir(dh); - - } - else if (strncmp(signame, "collapse", 8) == 0) { - GtkWidget *subtree = gtk_tree_new(); - - gtk_tree_remove_items(GTK_TREE(real_tree), GTK_TREE(real_tree)->children); - - gtk_tree_item_set_subtree(GTK_TREE_ITEM(item), subtree); - - gtk_signal_connect (GTK_OBJECT(subtree), "select_child", - GTK_SIGNAL_FUNC(cb_select_child), real_tree); - gtk_signal_connect (GTK_OBJECT(subtree), "unselect_child", - GTK_SIGNAL_FUNC(cb_unselect_child), real_tree); - - } - -} - -static void cb_selection_changed( GtkWidget *tree ) -{ - GList *i; - - g_print ("selection_change called for tree %p\n", tree); - g_print ("selected objects are:\n"); - - i = GTK_TREE_SELECTION(tree); - while (i){ - gchar *name; - GtkLabel *label; - GtkWidget *item; - - /* Get a GtkWidget pointer from the list node */ - item = GTK_WIDGET (i->data); - label = GTK_LABEL (GTK_BIN (item)->child); - gtk_label_get (label, &name); - g_print ("\t%s on level %d\n", name, GTK_TREE - (item->parent)->level); - i = i->next; - } -} - -/* - * Expand or collapse the whole network ... - */ -static void cb_wholenet(GtkWidget *item, gchar *signame) -{ - GtkWidget *real_tree, *aitem, *subtree; - gchar *name; - GtkLabel *label; - gint dh, err, dirlen; - char dirbuf[512]; - struct smbc_dirent *dirp; - - label = GTK_LABEL (GTK_BIN (item)->child); - gtk_label_get (label, &name); - g_print ("%s called for item %s->%p, level %d\n", signame, name, - item, GTK_TREE (item->parent)->level); - -- Samba Shared Repository