On 2019/08/10 17:33, kasak wrote:
> And as you mention, if i leave my vm for some time, it start working too.
>
> But with your patch everything working as it should! I can see time machine
> share in macos and can browse my shares with all other clients with no
> issues!
>
> Thank you very much for your help!
>
> The only trouble now is that smbd is starting quite long, but it starts,
> even if rc reports smbd (timeout)
>
There is an additional uncommitted ld.so diff which I expect will help with
that.
Index: dlfcn.c
===================================================================
RCS file: /cvs/src/libexec/ld.so/dlfcn.c,v
retrieving revision 1.104
diff -u -p -r1.104 dlfcn.c
--- dlfcn.c 4 Aug 2019 23:51:45 -0000 1.104
+++ dlfcn.c 10 Aug 2019 14:43:28 -0000
@@ -93,7 +93,7 @@ dlopen(const char *libname, int flags)
/* if opened but grpsym_list has not been created */
if (OBJECT_DLREF_CNT(object) == 1) {
/* add first object manually */
- _dl_link_grpsym(object, 1);
+ _dl_link_grpsym(object);
_dl_cache_grpsym_list(object);
}
goto loaded;
Index: library_subr.c
===================================================================
RCS file: /cvs/src/libexec/ld.so/library_subr.c,v
retrieving revision 1.48
diff -u -p -r1.48 library_subr.c
--- library_subr.c 28 Aug 2017 14:06:22 -0000 1.48
+++ library_subr.c 10 Aug 2019 14:43:28 -0000
@@ -527,19 +527,13 @@ _dl_link_child(elf_object_t *dep, elf_ob
static unsigned int _dl_grpsym_gen = 0;
void
-_dl_link_grpsym(elf_object_t *object, int checklist)
+_dl_link_grpsym(elf_object_t *object)
{
struct dep_node *n;
- if (checklist) {
- TAILQ_FOREACH(n, &_dl_loading_object->grpsym_list, next_sib)
- if (n->data == object)
- return; /* found, dont bother adding */
- } else {
- if (object->grpsym_gen == _dl_grpsym_gen) {
+ TAILQ_FOREACH(n, &_dl_loading_object->grpsym_list, next_sib)
+ if (n->data == object)
return; /* found, dont bother adding */
- }
- }
object->grpsym_gen = _dl_grpsym_gen;
n = _dl_malloc(sizeof *n);
@@ -572,6 +566,7 @@ _dl_cache_grpsym_list_setup(elf_object_t
void
_dl_cache_grpsym_list(elf_object_t *object)
{
+ int recurse = 0;
struct dep_node *n;
/*
@@ -581,8 +576,12 @@ _dl_cache_grpsym_list(elf_object_t *obje
*/
TAILQ_FOREACH(n, &object->child_list, next_sib)
- _dl_link_grpsym(n->data, 0);
+ if (n->data->grpsym_gen != _dl_grpsym_gen) {
+ _dl_link_grpsym(n->data);
+ recurse = 1;
+ }
- TAILQ_FOREACH(n, &object->child_list, next_sib)
- _dl_cache_grpsym_list(n->data);
+ if (recurse)
+ TAILQ_FOREACH(n, &object->child_list, next_sib)
+ _dl_cache_grpsym_list(n->data);
}
Index: loader.c
===================================================================
RCS file: /cvs/src/libexec/ld.so/loader.c,v
retrieving revision 1.185
diff -u -p -r1.185 loader.c
--- loader.c 6 Aug 2019 04:01:41 -0000 1.185
+++ loader.c 10 Aug 2019 14:43:28 -0000
@@ -398,7 +398,7 @@ _dl_load_dep_libs(elf_object_t *object,
}
/* add first object manually */
- _dl_link_grpsym(object, 1);
+ _dl_link_grpsym(object);
_dl_cache_grpsym_list_setup(object);
return(0);
@@ -585,7 +585,7 @@ _dl_boot(const char **argv, char **envp,
_dl_add_object(dyn_obj);
dyn_obj->refcount++;
- _dl_link_grpsym(dyn_obj, 1);
+ _dl_link_grpsym(dyn_obj);
dyn_obj->status |= STAT_RELOC_DONE;
_dl_set_sod(dyn_obj->load_name, &dyn_obj->sod);
Index: resolve.h
===================================================================
RCS file: /cvs/src/libexec/ld.so/resolve.h,v
retrieving revision 1.94
diff -u -p -r1.94 resolve.h
--- resolve.h 4 Aug 2019 23:51:45 -0000 1.94
+++ resolve.h 10 Aug 2019 14:43:28 -0000
@@ -288,7 +288,7 @@ int _dl_load_dep_libs(elf_object_t *obje
int _dl_rtld(elf_object_t *object);
void _dl_call_init(elf_object_t *object);
void _dl_link_child(elf_object_t *dep, elf_object_t *p);
-void _dl_link_grpsym(elf_object_t *object, int checklist);
+void _dl_link_grpsym(elf_object_t *object);
void _dl_cache_grpsym_list(elf_object_t *object);
void _dl_cache_grpsym_list_setup(elf_object_t *object);
void _dl_link_grpref(elf_object_t *load_group, elf_object_t *load_object);
