Jeremy Allison [Thu, 15 Nov 2007 22:19:52 +0000 (14:19 -0800)]
More pstring removal. This one was tricky. I had to add
one horror (pstring_clean_name()) which will have to
remain until I've removed all pstrings from the client code.
Jeremy.
Jeremy Allison [Thu, 15 Nov 2007 21:18:42 +0000 (13:18 -0800)]
alpha_strcpy includes the space for the terminating nul.
Jeremy.
Gerald (Jerry) Carter [Thu, 15 Nov 2007 02:51:14 +0000 (20:51 -0600)]
Fix for CVE-2007-5398.
== Subject: Remote code execution in Samba's WINS
== server daemon (nmbd) when processing name
== registration followed name query requests.
==
== CVE ID#: CVE-2007-5398
==
== Versions: Samba 3.0.0 - 3.0.26a (inclusive)
...
Secunia Research reported a vulnerability that allows for
the execution of arbitrary code in nmbd. This defect may
only be exploited when the "wins support" parameter has
been enabled in smb.conf.
Michael Adam [Thu, 15 Nov 2007 10:08:53 +0000 (11:08 +0100)]
Fix bug #5083 (and duplicate bug #5084).
Make solarisacl_sys_acl_get_fd() return a result
when there is one (thereby fixing a memleak).
Thanks to Markus Zell for reporting this.
Michael
Jeremy Allison [Thu, 15 Nov 2007 00:05:42 +0000 (16:05 -0800)]
Remove smbldap_get_single_pstring() and all pstrings
from pdb_ldap.c. I don't have an LDAP passdb setup here,
so I'm going to need some help on testing this.
Jeremy.
Jeremy Allison [Wed, 14 Nov 2007 18:37:18 +0000 (10:37 -0800)]
Remove pstring from auth/*
Jeremy.
Jeremy Allison [Wed, 14 Nov 2007 02:42:42 +0000 (18:42 -0800)]
Remove pstring from param/
This was a little tricky..... I'll watch the
build farm.
Jeremy.
Jeremy Allison [Tue, 13 Nov 2007 23:00:48 +0000 (15:00 -0800)]
Remove all pstring from groupdb/
Jeremy.
Michael Adam [Tue, 13 Nov 2007 22:26:38 +0000 (23:26 +0100)]
Fix potential orphaned open files.
Calling can_access_file could lead to orphaned open files
when SMB_VFS_GET_NT_ACL returned ENOSYS (not implemented).
Michael
Jeremy Allison [Tue, 13 Nov 2007 20:51:31 +0000 (12:51 -0800)]
Remove last pstring from smbd/*.c
Jeremy.
Michael Adam [Mon, 12 Nov 2007 11:49:40 +0000 (12:49 +0100)]
Fix build of the zfs_acl module.
There was one caller of smb_get_nt_acl_nfs4() forgotten
in the change of return value.
Michael
Michael Adam [Mon, 12 Nov 2007 11:48:29 +0000 (12:48 +0100)]
Fix the build: correct prototype.
Adapt prototype of smb_get_nt_acl_nfs4() in the header file, too.
Michael
Volker Lendecke [Sat, 13 Oct 2007 19:06:49 +0000 (21:06 +0200)]
Make [f]get_nt_acl return NTSTATUS
Jeremy Allison [Tue, 13 Nov 2007 02:12:26 +0000 (18:12 -0800)]
More pstring removal from smbd/*.c
Jeremy.
Jeremy Allison [Tue, 13 Nov 2007 01:59:18 +0000 (17:59 -0800)]
Remove pstrings from lanman.c
Jeremy.
Jeremy Allison [Mon, 12 Nov 2007 23:02:50 +0000 (15:02 -0800)]
Remove all pstrings from smbd/chgpasswd.c.
Jeremy.
Jeremy Allison [Mon, 12 Nov 2007 19:39:35 +0000 (11:39 -0800)]
Fix bug #5073. Allow "delete readonly = yes" to correctly
override deletion of a file. Fix from David Shaw <dshaw@jabberwocky.com>
Jeremy.
Jeremy Allison [Mon, 12 Nov 2007 05:46:52 +0000 (21:46 -0800)]
Three more pstring removals.
Jeremy.
Jeremy Allison [Mon, 12 Nov 2007 05:45:55 +0000 (21:45 -0800)]
Remove a pstring.
Jeremy.
Volker Lendecke [Sun, 11 Nov 2007 14:30:01 +0000 (15:30 +0100)]
Some pstring removal
Hi!
Feel free to push :-)
Volker
From
7fae6b3709a973bd0a5a13d3f5c880c61d5e35de Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl@sernet.de>
Date: Sun, 11 Nov 2007 15:28:59 +0100
Subject: [PATCH] Remove some static pstrings
Volker Lendecke [Sun, 11 Nov 2007 11:49:42 +0000 (12:49 +0100)]
Cosmetic fix
Do directory vs file open before entering open_file_stat
Jeremy Allison [Sun, 11 Nov 2007 21:18:22 +0000 (13:18 -0800)]
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
Volker Lendecke [Sun, 11 Nov 2007 14:50:16 +0000 (15:50 +0100)]
Remove a static fstring
Feel free to push :-)
Volker
Volker Lendecke [Sun, 11 Nov 2007 14:38:50 +0000 (15:38 +0100)]
Remove a static fstring
I'm not sure why this used to be static, to me it seems that every time this
variable is overwritten. I just don't see how name_status_find() could return
true and not overwrite name. Can someone please review this and potentially
check it in?
Thanks,
Volker
Volker Lendecke [Sat, 10 Nov 2007 22:15:40 +0000 (23:15 +0100)]
Convert ctdb_conn.c to enum ndr_error_code
Fix the build
Volker Lendecke [Sat, 10 Nov 2007 20:37:24 +0000 (21:37 +0100)]
Add ndr_errstr
Jeremy Allison [Sun, 11 Nov 2007 06:31:34 +0000 (22:31 -0800)]
Always define PATH_MAX. Makes code simpler (removes
a bunch of #defines). Remove pstring from msdfs.c.
Jeremy.
Jeremy Allison [Sat, 10 Nov 2007 23:36:47 +0000 (15:36 -0800)]
Remove last pstring from sesssetup.c
Jeremy.
Jeremy Allison [Sat, 10 Nov 2007 23:02:08 +0000 (15:02 -0800)]
Fix the build when realpath doesn't take null
as a last arg.
Jeremy.
Jeremy Allison [Sat, 10 Nov 2007 22:43:39 +0000 (14:43 -0800)]
Remove pstring from service.c.
Jeremy.
Jeremy Allison [Fri, 9 Nov 2007 23:09:16 +0000 (15:09 -0800)]
Remove more static fstring/pstrings. Fix socket option
set on wrong fd (-1).
Jeremy.
Stefan Metzmacher [Fri, 9 Nov 2007 13:39:45 +0000 (14:39 +0100)]
ndr: change NTSTAUS into enum ndr_err_code (samba3 callers)
lib/messages_local.c
rpc_client/ndr.c
smbd/notify_internal.c
utils/net_rpc_registry.c
metze
metze [Fri, 9 Nov 2007 19:24:25 +0000 (19:24 +0000)]
ndr: change NTSTAUS into enum ndr_err_code (ndrdump)
librpc/tools/ndrdump.c
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25919
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
Stefan Metzmacher [Fri, 9 Nov 2007 13:38:47 +0000 (14:38 +0100)]
rerun make idl
metze
Stefan Metzmacher [Fri, 9 Nov 2007 12:00:43 +0000 (13:00 +0100)]
ndr: change NTSTAUS into enum ndr_err_code (samba3 handwritten stuff)
ndr_misc.c
ndr_sec.h
ndr_sec_helper.c
librpc/ndr/sid.c
metze
metze [Fri, 9 Nov 2007 19:23:40 +0000 (19:23 +0000)]
ndr: change NTSTAUS into enum ndr_err_code (basic stuff)
librpc/ndr/
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25916
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
Stefan Metzmacher [Fri, 9 Nov 2007 20:20:46 +0000 (21:20 +0100)]
prepare changes in ndr code
metze
Volker Lendecke [Wed, 10 Oct 2007 14:57:34 +0000 (16:57 +0200)]
Sanitize smbcacls slightly
Volker Lendecke [Fri, 9 Nov 2007 13:23:16 +0000 (14:23 +0100)]
Fix some warnings
Volker Lendecke [Fri, 9 Nov 2007 13:23:16 +0000 (14:23 +0100)]
nss_wrapper: Fix some warnings
Volker Lendecke [Fri, 9 Nov 2007 13:23:16 +0000 (14:23 +0100)]
Fix some warnings
Volker Lendecke [Wed, 7 Nov 2007 22:24:36 +0000 (23:24 +0100)]
Add some comments
Volker Lendecke [Sun, 28 Oct 2007 18:15:08 +0000 (19:15 +0100)]
Make base64_encode_data_blob return a talloced string
Volker Lendecke [Thu, 1 Nov 2007 17:13:00 +0000 (18:13 +0100)]
Remove the silly "user_socket_options" global variable
This is better done with a 'lp_do_parameter(-1, "socket options", ..);
Volker Lendecke [Wed, 7 Nov 2007 17:47:32 +0000 (18:47 +0100)]
pstring removal
Volker Lendecke [Wed, 7 Nov 2007 18:06:30 +0000 (19:06 +0100)]
Fix dbwrap debug output
Stefan Metzmacher [Fri, 9 Nov 2007 13:35:58 +0000 (14:35 +0100)]
make test: try to get a more portable way to get UID and GID
metze
Karolin Seeger [Fri, 9 Nov 2007 10:30:30 +0000 (11:30 +0100)]
Fix typo
Stefan Metzmacher [Fri, 9 Nov 2007 10:50:14 +0000 (11:50 +0100)]
use samba4's librpc/ndr/uuid.c
metze
Michael Adam [Fri, 9 Nov 2007 10:18:45 +0000 (11:18 +0100)]
The FSF has moved around a lot. This fixes their Mass Ave address.
This adapts r23801 /
87c91e4362c51819032bfbebbb273c52e203b227
to files just added by cherry-pick.
Michael
Michael Adam [Fri, 9 Nov 2007 10:17:18 +0000 (11:17 +0100)]
Find and fix more GPL2 -> GPL3.
Jeremy.
This adapts r23780 /
c2f7ab1c175ecff0cf44d0bbc4763ba9f7d7803f
for files added by cherry-pick.
Michael Adam [Thu, 5 Jul 2007 00:12:24 +0000 (00:12 +0000)]
r23714: This script allows for adding lists of users (or other objects)
to lists of groups (or aliases). Useful for creating large test
scenarios.
Michael
(cherry picked from commit
b3e5082e105f6eaeed51e9a42d525d811e7155ee)
Michael Adam [Wed, 4 Jul 2007 23:21:51 +0000 (23:21 +0000)]
r23711: Refactor the actual creation of object into its own small function.
Michael
(cherry picked from commit
26349c0b173e8baf6fa43deb39cb2bfdb31bf18e)
Michael Adam [Wed, 4 Jul 2007 16:17:48 +0000 (16:17 +0000)]
r23706: Add a script to create domainusers,-groups and -aliases.
This is done via rpc client. The main purpose is to
be able to fill a domain controller with a large number
of users / groups easily. A the object names are
built as <prefix><num> where number ranges from a given
start number counting up until a given number of objects
has been created.
In a next step, I will submit scripts to add (many) users to
a group and to add a user to (many) groups.
Michael
(cherry picked from commit
8b81fbb7d998eda65978a772f2194b4a3de467f9)
Stefan Metzmacher [Wed, 24 Oct 2007 11:18:42 +0000 (13:18 +0200)]
make test: start winbindd
metze
Stefan Metzmacher [Thu, 18 Oct 2007 15:14:37 +0000 (17:14 +0200)]
we don't have build-farm specific tests anymore
metze
Stefan Metzmacher [Thu, 18 Oct 2007 15:13:01 +0000 (17:13 +0200)]
remove faked_create_user() BUILD_FARM hack as we have nss_wrapper now
metze
Stefan Metzmacher [Mon, 5 Nov 2007 08:49:08 +0000 (09:49 +0100)]
make test: activate nss_wrapper for make test
metze
metze [Tue, 6 Nov 2007 12:34:50 +0000 (12:34 +0000)]
nss_wrapper: hopefully a better fix for the solaris get*ent_r functions
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25873
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Tue, 6 Nov 2007 12:15:19 +0000 (12:15 +0000)]
nss_wrapper: revert solaris get*ent_r() functions
This was the wrong approach, as in future lib/replace
should hide this special solaris stuff.
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25872
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Tue, 6 Nov 2007 12:11:35 +0000 (12:11 +0000)]
nss_wrapper: set the destination pointer in the get*_r functions
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25871
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Tue, 6 Nov 2007 10:40:07 +0000 (10:40 +0000)]
libreplace: AC_VERIFY_C_PROTOTYPE() needs AC_LANG_SOURCE() to bring in confdefs.h
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25870
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Tue, 6 Nov 2007 09:26:42 +0000 (09:26 +0000)]
nss_wrapper: add solaris versions of getpwent_r and getgrent_r
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25868
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Tue, 6 Nov 2007 09:15:11 +0000 (09:15 +0000)]
libreplace: solaris has different prototypes for getpwent_r and getgrent_r
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25867
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Tue, 6 Nov 2007 08:06:50 +0000 (08:06 +0000)]
nss_wrapper: not all systems have get*_r calls
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25866
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Tue, 6 Nov 2007 07:26:12 +0000 (07:26 +0000)]
libreplace: check for nss passwd|group get*_r functions
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25865
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
Stefan Metzmacher [Thu, 18 Oct 2007 14:46:16 +0000 (16:46 +0200)]
use nss_wrapper code in samba3 when --enable-nss-wrapper is given
metze
metze [Mon, 5 Nov 2007 15:42:38 +0000 (15:42 +0000)]
nss_wrapper: add nss_wrapper.pl
This script will be used to add|delete passwd|group entries
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25837
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Mon, 5 Nov 2007 15:41:23 +0000 (15:41 +0000)]
nss_wrapper: add support for groups and return EPERM in initgroups()
The NSS_WRAPPER_GROUP envvar should point to
the /etc/group style file.
Note: NSS_WRAPPER_PASSWD and NSS_WRAPPER_GROUP both
need non-empty values to enable NSS Wrapper
support.
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25836
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Mon, 5 Nov 2007 15:39:46 +0000 (15:39 +0000)]
nss_wrapper: add support for passwd accounts
The NSS_WRAPPER_PASSWD envvar should point to
the /etc/passwd style file.
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25835
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Mon, 5 Nov 2007 15:38:36 +0000 (15:38 +0000)]
nss_wrapper: add lib/nss_wrapper skeleton
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25834
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
jelmer [Wed, 7 Nov 2007 01:32:17 +0000 (01:32 +0000)]
Try to fix building dso's on hpux with gcc
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25886
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
jelmer [Tue, 6 Nov 2007 18:25:34 +0000 (18:25 +0000)]
Try to get some more flags right.
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25880
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
jelmer [Tue, 6 Nov 2007 16:23:18 +0000 (16:23 +0000)]
Add libreplace macro for soname flags.
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25877
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
jelmer [Tue, 6 Nov 2007 14:51:42 +0000 (14:51 +0000)]
Try to fix the build on some HPUX machines.
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25875
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
Jeremy Allison [Fri, 9 Nov 2007 03:00:10 +0000 (19:00 -0800)]
More pstring/fstring removal.
Jeremy.
Jeremy Allison [Fri, 9 Nov 2007 02:50:07 +0000 (18:50 -0800)]
Remove more pstring/fstrings.
Jeremy.
Jeremy Allison [Fri, 9 Nov 2007 02:01:00 +0000 (18:01 -0800)]
Remove unneeded variable.
Jeremy.
Jeremy Allison [Fri, 9 Nov 2007 01:58:55 +0000 (17:58 -0800)]
Fix case where we have no dns domain name. Return a talloc of "".
Jeremy.
Jeremy Allison [Fri, 9 Nov 2007 01:25:45 +0000 (17:25 -0800)]
Remove more fstring/pstring bad useage. Go talloc !
Jeremy.
Jeremy Allison [Thu, 8 Nov 2007 23:13:41 +0000 (15:13 -0800)]
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
Stefan Metzmacher [Thu, 8 Nov 2007 13:36:13 +0000 (14:36 +0100)]
sync the most parts of librpc/ndr with samba4
metze
Stefan Metzmacher [Thu, 8 Nov 2007 13:34:02 +0000 (14:34 +0100)]
add '_PUBLIC_' prototypes into proto.h
this makes merging samba4 code easier...
metze
Stefan Metzmacher [Thu, 8 Nov 2007 13:33:04 +0000 (14:33 +0100)]
add win_errstr() as wrapper of dos_errstr().
this makes merging stuff from samba4 easier
metze
Stefan Metzmacher [Thu, 8 Nov 2007 12:52:56 +0000 (13:52 +0100)]
we should not ignore convert_string_talloc() failures.
In all other places in ndr_string.c we already use False...
metze
Stefan Metzmacher [Thu, 8 Nov 2007 11:18:28 +0000 (12:18 +0100)]
libreplace: we need to link to make sure the functions are available
metze
Michael Adam [Thu, 8 Nov 2007 10:46:13 +0000 (11:46 +0100)]
Try to fix the build on systems without struct sockaddr_storage type
(like hape - HPUX 11.00).
Michael
Jeremy Allison [Thu, 8 Nov 2007 05:47:00 +0000 (21:47 -0800)]
Constrain "min receivefile size" to max of BUFFER_SIZE
(128k). Add debug error messages so we can see why
writeX large is denied. Ensure we don't allow recvfile
writes on IPC$.
Jeremy.
Michael Adam [Wed, 7 Nov 2007 21:28:26 +0000 (22:28 +0100)]
Try to fix the build on irix.
There were two callers of set_smb_read_error() in irix_oplocks.c
not converted to the new prototype.
Michael
Jeremy Allison [Wed, 7 Nov 2007 20:48:58 +0000 (12:48 -0800)]
Unify the name and addr cache for client_name to
make threading easier ultimately.
Jeremy.
metze [Fri, 2 Nov 2007 11:01:18 +0000 (11:01 +0000)]
- check return value of ndr_push_set_switch_value()
- fix memory leaks in error pathes
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25798
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Fri, 2 Nov 2007 10:59:43 +0000 (10:59 +0000)]
use error and out logic
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25797
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Fri, 2 Nov 2007 10:49:51 +0000 (10:49 +0000)]
use NT_STATUS_HAVE_NO_MEMORY()
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25796
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Fri, 2 Nov 2007 10:32:47 +0000 (10:32 +0000)]
use NDR_CHECK()
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25794
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Fri, 2 Nov 2007 10:29:19 +0000 (10:29 +0000)]
check the return value of ndr_push_set_switch_value()
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25793
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Fri, 2 Nov 2007 10:26:49 +0000 (10:26 +0000)]
use NT_STATUS_HAVE_NO_MEMORY() and NDR_CHECK()
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25792
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Thu, 1 Nov 2007 10:15:13 +0000 (10:15 +0000)]
the return value of ndr_pull_set_switch_value() should be checked
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25779
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Thu, 1 Nov 2007 10:13:36 +0000 (10:13 +0000)]
use NT_STATUS_HAVE_NO_MEMORY() and NDR_CHECK() macros
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25778
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Thu, 1 Nov 2007 09:50:24 +0000 (09:50 +0000)]
add NDR_ERR_UNREAD_BYTES and don't use NTSTATUS directly
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25777
0c0555d6-39d7-0310-84fc-
f1cc0bd64818
metze [Thu, 1 Nov 2007 08:10:54 +0000 (08:10 +0000)]
create ndr_pull_union_blob_all() and match the logic of the struct fns
metze
git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25774
0c0555d6-39d7-0310-84fc-
f1cc0bd64818