diff options
author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-08-10 17:24:04 +0000 |
---|---|---|
committer | Laurent Bercot <ska@appnovation.com> | 2021-08-10 17:24:04 +0000 |
commit | c9a58ceb7c07774944930105ace2f042be7b5f53 (patch) | |
tree | 554a1014d8835b5d8344dc9315c0572e75e633e5 /src/libnsss | |
parent | eed713a7a54262c9df8fa139db7d75112115d63f (diff) | |
download | nsss-c9a58ceb7c07774944930105ace2f042be7b5f53.tar.xz |
Adapt to skalibs-2.11.0.0, prepare for 0.1.0.2
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src/libnsss')
-rw-r--r-- | src/libnsss/nsss-switch-internal.h | 8 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_grp_end.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_grp_get.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_grp_getbygid.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_grp_getbyname.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_grp_getlist.c | 4 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_grp_read.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_grp_rewind.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_op.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_pwd_end.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_pwd_get.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_pwd_getbyname.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_pwd_getbyuid.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_pwd_read.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_pwd_rewind.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_shadow_end.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_shadow_get.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_shadow_getbyname.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_shadow_read.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_shadow_rewind.c | 2 | ||||
-rw-r--r-- | src/libnsss/nsss_switch_start.c | 4 |
21 files changed, 26 insertions, 26 deletions
diff --git a/src/libnsss/nsss-switch-internal.h b/src/libnsss/nsss-switch-internal.h index e005ffc..2b93434 100644 --- a/src/libnsss/nsss-switch-internal.h +++ b/src/libnsss/nsss-switch-internal.h @@ -13,9 +13,9 @@ #include <nsss/nsss-switch.h> extern nsss_switch_t nsss_switch_here ; -extern int nsss_switch_op (nsss_switch_t *, char, tain_t const *, tain_t *) ; -extern int nsss_switch_pwd_read (buffer *, struct passwd *, stralloc *, tain_t const *, tain_t *) ; -extern int nsss_switch_grp_read (buffer *, struct group *, stralloc *, genalloc *, tain_t const *, tain_t *) ; -extern int nsss_switch_shadow_read (buffer *, struct spwd *, stralloc *, tain_t const *, tain_t *) ; +extern int nsss_switch_op (nsss_switch_t *, char, tain const *, tain *) ; +extern int nsss_switch_pwd_read (buffer *, struct passwd *, stralloc *, tain const *, tain *) ; +extern int nsss_switch_grp_read (buffer *, struct group *, stralloc *, genalloc *, tain const *, tain *) ; +extern int nsss_switch_shadow_read (buffer *, struct spwd *, stralloc *, tain const *, tain *) ; #endif diff --git a/src/libnsss/nsss_switch_grp_end.c b/src/libnsss/nsss_switch_grp_end.c index 3b8ba21..da42cd4 100644 --- a/src/libnsss/nsss_switch_grp_end.c +++ b/src/libnsss/nsss_switch_grp_end.c @@ -3,7 +3,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_grp_end (nsss_switch_t *a, tain_t const *deadline, tain_t *stamp) +int nsss_switch_grp_end (nsss_switch_t *a, tain const *deadline, tain *stamp) { return nsss_switch_op(a, NSSS_SWITCH_GRP_END, deadline, stamp) ; } diff --git a/src/libnsss/nsss_switch_grp_get.c b/src/libnsss/nsss_switch_grp_get.c index 65da4e3..8ba52b1 100644 --- a/src/libnsss/nsss_switch_grp_get.c +++ b/src/libnsss/nsss_switch_grp_get.c @@ -6,7 +6,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_grp_get (nsss_switch_t *a, struct group *gr, stralloc *sa, genalloc *ga, tain_t const *deadline, tain_t *stamp) +int nsss_switch_grp_get (nsss_switch_t *a, struct group *gr, stralloc *sa, genalloc *ga, tain const *deadline, tain *stamp) { unsigned char c = NSSS_SWITCH_GRP_GET ; if (!ipc_timed_send(buffer_fd(&a->b), (char *)&c, 1, deadline, stamp)) return 0 ; diff --git a/src/libnsss/nsss_switch_grp_getbygid.c b/src/libnsss/nsss_switch_grp_getbygid.c index 3b9802b..8a4e7e3 100644 --- a/src/libnsss/nsss_switch_grp_getbygid.c +++ b/src/libnsss/nsss_switch_grp_getbygid.c @@ -7,7 +7,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_grp_getbygid (nsss_switch_t *a, struct group *gr, stralloc *sa, genalloc *ga, gid_t gid, tain_t const *deadline, tain_t *stamp) +int nsss_switch_grp_getbygid (nsss_switch_t *a, struct group *gr, stralloc *sa, genalloc *ga, gid_t gid, tain const *deadline, tain *stamp) { char buf[5] = { NSSS_SWITCH_GRP_GETBYGID } ; uint32_pack_big(buf + 1, gid) ; diff --git a/src/libnsss/nsss_switch_grp_getbyname.c b/src/libnsss/nsss_switch_grp_getbyname.c index 2ece9d2..086cdb1 100644 --- a/src/libnsss/nsss_switch_grp_getbyname.c +++ b/src/libnsss/nsss_switch_grp_getbyname.c @@ -9,7 +9,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_grp_getbyname (nsss_switch_t *a, struct group *gr, stralloc *sa, genalloc *ga, char const *name, tain_t const *deadline, tain_t *stamp) +int nsss_switch_grp_getbyname (nsss_switch_t *a, struct group *gr, stralloc *sa, genalloc *ga, char const *name, tain const *deadline, tain *stamp) { char buf[5] = { NSSS_SWITCH_GRP_GETBYNAME } ; size_t len = strlen(name) ; diff --git a/src/libnsss/nsss_switch_grp_getlist.c b/src/libnsss/nsss_switch_grp_getlist.c index 70e4486..abd4d84 100644 --- a/src/libnsss/nsss_switch_grp_getlist.c +++ b/src/libnsss/nsss_switch_grp_getlist.c @@ -21,7 +21,7 @@ min(n, r) * sizeof(gid_t) bytes: the list of gids */ -static int nsss_switch_grouplist_read (buffer *b, size_t n, size_t *r, gid_t *gids, stralloc *sa, tain_t const *deadline, tain_t *stamp) +static int nsss_switch_grouplist_read (buffer *b, size_t n, size_t *r, gid_t *gids, stralloc *sa, tain const *deadline, tain *stamp) { size_t rr ; uint64_t res ; @@ -51,7 +51,7 @@ static int nsss_switch_grouplist_read (buffer *b, size_t n, size_t *r, gid_t *gi return 1 ; } -int nsss_switch_grp_getlist (nsss_switch_t *a, char const *user, gid_t *gids, size_t n, size_t *r, stralloc *sa, tain_t const *deadline, tain_t *stamp) +int nsss_switch_grp_getlist (nsss_switch_t *a, char const *user, gid_t *gids, size_t n, size_t *r, stralloc *sa, tain const *deadline, tain *stamp) { char buf[13] = { NSSS_SWITCH_GRP_GETLIST } ; size_t len = strlen(user) ; diff --git a/src/libnsss/nsss_switch_grp_read.c b/src/libnsss/nsss_switch_grp_read.c index 1ab6cbb..47577f0 100644 --- a/src/libnsss/nsss_switch_grp_read.c +++ b/src/libnsss/nsss_switch_grp_read.c @@ -24,7 +24,7 @@ sequence of n \0-terminated elements in gr_mem */ -int nsss_switch_grp_read (buffer *b, struct group *gr, stralloc *sa, genalloc *ga, tain_t const *deadline, tain_t *stamp) +int nsss_switch_grp_read (buffer *b, struct group *gr, stralloc *sa, genalloc *ga, tain const *deadline, tain *stamp) { struct group grtmp ; uint32_t total, len, n, x ; diff --git a/src/libnsss/nsss_switch_grp_rewind.c b/src/libnsss/nsss_switch_grp_rewind.c index 347b071..78c0b61 100644 --- a/src/libnsss/nsss_switch_grp_rewind.c +++ b/src/libnsss/nsss_switch_grp_rewind.c @@ -3,7 +3,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_grp_rewind (nsss_switch_t *a, tain_t const *deadline, tain_t *stamp) +int nsss_switch_grp_rewind (nsss_switch_t *a, tain const *deadline, tain *stamp) { return nsss_switch_op(a, NSSS_SWITCH_GRP_REWIND, deadline, stamp) ; } diff --git a/src/libnsss/nsss_switch_op.c b/src/libnsss/nsss_switch_op.c index 8b5bee3..77c49ed 100644 --- a/src/libnsss/nsss_switch_op.c +++ b/src/libnsss/nsss_switch_op.c @@ -6,7 +6,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_op (nsss_switch_t *a, char op, tain_t const *deadline, tain_t *stamp) +int nsss_switch_op (nsss_switch_t *a, char op, tain const *deadline, tain *stamp) { char c ; if (!ipc_timed_send(buffer_fd(&a->b), &op, 1, deadline, stamp)) return 0 ; diff --git a/src/libnsss/nsss_switch_pwd_end.c b/src/libnsss/nsss_switch_pwd_end.c index a082474..f4a5d51 100644 --- a/src/libnsss/nsss_switch_pwd_end.c +++ b/src/libnsss/nsss_switch_pwd_end.c @@ -3,7 +3,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_pwd_end (nsss_switch_t *a, tain_t const *deadline, tain_t *stamp) +int nsss_switch_pwd_end (nsss_switch_t *a, tain const *deadline, tain *stamp) { return nsss_switch_op(a, NSSS_SWITCH_PWD_END, deadline, stamp) ; } diff --git a/src/libnsss/nsss_switch_pwd_get.c b/src/libnsss/nsss_switch_pwd_get.c index 0c630f8..6b9c310 100644 --- a/src/libnsss/nsss_switch_pwd_get.c +++ b/src/libnsss/nsss_switch_pwd_get.c @@ -6,7 +6,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_pwd_get (nsss_switch_t *a, struct passwd *pw, stralloc *sa, tain_t const *deadline, tain_t *stamp) +int nsss_switch_pwd_get (nsss_switch_t *a, struct passwd *pw, stralloc *sa, tain const *deadline, tain *stamp) { char c = NSSS_SWITCH_PWD_GET ; if (!ipc_timed_send(buffer_fd(&a->b), &c, 1, deadline, stamp)) return 0 ; diff --git a/src/libnsss/nsss_switch_pwd_getbyname.c b/src/libnsss/nsss_switch_pwd_getbyname.c index a10d129..9b3d164 100644 --- a/src/libnsss/nsss_switch_pwd_getbyname.c +++ b/src/libnsss/nsss_switch_pwd_getbyname.c @@ -9,7 +9,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_pwd_getbyname (nsss_switch_t *a, struct passwd *pw, stralloc *sa, char const *name, tain_t const *deadline, tain_t *stamp) +int nsss_switch_pwd_getbyname (nsss_switch_t *a, struct passwd *pw, stralloc *sa, char const *name, tain const *deadline, tain *stamp) { char buf[5] = { NSSS_SWITCH_PWD_GETBYNAME } ; size_t len = strlen(name) ; diff --git a/src/libnsss/nsss_switch_pwd_getbyuid.c b/src/libnsss/nsss_switch_pwd_getbyuid.c index b1d98cf..3e95e9e 100644 --- a/src/libnsss/nsss_switch_pwd_getbyuid.c +++ b/src/libnsss/nsss_switch_pwd_getbyuid.c @@ -7,7 +7,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_pwd_getbyuid (nsss_switch_t *a, struct passwd *pw, stralloc *sa, uid_t uid, tain_t const *deadline, tain_t *stamp) +int nsss_switch_pwd_getbyuid (nsss_switch_t *a, struct passwd *pw, stralloc *sa, uid_t uid, tain const *deadline, tain *stamp) { char buf[5] = { NSSS_SWITCH_PWD_GETBYUID } ; uint32_pack_big(buf + 1, uid) ; diff --git a/src/libnsss/nsss_switch_pwd_read.c b/src/libnsss/nsss_switch_pwd_read.c index 759bc23..4cfb9c5 100644 --- a/src/libnsss/nsss_switch_pwd_read.c +++ b/src/libnsss/nsss_switch_pwd_read.c @@ -24,7 +24,7 @@ \0-terminated pw_shell */ -int nsss_switch_pwd_read (buffer *b, struct passwd *pw, stralloc *sa, tain_t const *deadline, tain_t *stamp) +int nsss_switch_pwd_read (buffer *b, struct passwd *pw, stralloc *sa, tain const *deadline, tain *stamp) { struct passwd pwtmp ; uint32_t total, len, x ; diff --git a/src/libnsss/nsss_switch_pwd_rewind.c b/src/libnsss/nsss_switch_pwd_rewind.c index 9920760..f2068be 100644 --- a/src/libnsss/nsss_switch_pwd_rewind.c +++ b/src/libnsss/nsss_switch_pwd_rewind.c @@ -3,7 +3,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_pwd_rewind (nsss_switch_t *a, tain_t const *deadline, tain_t *stamp) +int nsss_switch_pwd_rewind (nsss_switch_t *a, tain const *deadline, tain *stamp) { return nsss_switch_op(a, NSSS_SWITCH_PWD_REWIND, deadline, stamp) ; } diff --git a/src/libnsss/nsss_switch_shadow_end.c b/src/libnsss/nsss_switch_shadow_end.c index eb3454d..afa5699 100644 --- a/src/libnsss/nsss_switch_shadow_end.c +++ b/src/libnsss/nsss_switch_shadow_end.c @@ -3,7 +3,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_shadow_end (nsss_switch_t *a, tain_t const *deadline, tain_t *stamp) +int nsss_switch_shadow_end (nsss_switch_t *a, tain const *deadline, tain *stamp) { return nsss_switch_op(a, NSSS_SWITCH_SHADOW_END, deadline, stamp) ; } diff --git a/src/libnsss/nsss_switch_shadow_get.c b/src/libnsss/nsss_switch_shadow_get.c index e510232..27b1e70 100644 --- a/src/libnsss/nsss_switch_shadow_get.c +++ b/src/libnsss/nsss_switch_shadow_get.c @@ -6,7 +6,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_shadow_get (nsss_switch_t *a, struct spwd *sp, stralloc *sa, tain_t const *deadline, tain_t *stamp) +int nsss_switch_shadow_get (nsss_switch_t *a, struct spwd *sp, stralloc *sa, tain const *deadline, tain *stamp) { char c = NSSS_SWITCH_SHADOW_GET ; if (!ipc_timed_send(buffer_fd(&a->b), &c, 1, deadline, stamp)) return 0 ; diff --git a/src/libnsss/nsss_switch_shadow_getbyname.c b/src/libnsss/nsss_switch_shadow_getbyname.c index 33fa426..5e91c5a 100644 --- a/src/libnsss/nsss_switch_shadow_getbyname.c +++ b/src/libnsss/nsss_switch_shadow_getbyname.c @@ -9,7 +9,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_shadow_getbyname (nsss_switch_t *a, struct spwd *sp, stralloc *sa, char const *name, tain_t const *deadline, tain_t *stamp) +int nsss_switch_shadow_getbyname (nsss_switch_t *a, struct spwd *sp, stralloc *sa, char const *name, tain const *deadline, tain *stamp) { char buf[5] = { NSSS_SWITCH_SHADOW_GETBYNAME } ; size_t len = strlen(name) ; diff --git a/src/libnsss/nsss_switch_shadow_read.c b/src/libnsss/nsss_switch_shadow_read.c index 709d031..7d4c2a4 100644 --- a/src/libnsss/nsss_switch_shadow_read.c +++ b/src/libnsss/nsss_switch_shadow_read.c @@ -27,7 +27,7 @@ \0-terminated sp_pwdp */ -int nsss_switch_shadow_read (buffer *b, struct spwd *sp, stralloc *sa, tain_t const *deadline, tain_t *stamp) +int nsss_switch_shadow_read (buffer *b, struct spwd *sp, stralloc *sa, tain const *deadline, tain *stamp) { struct spwd sptmp ; uint64_t x ; diff --git a/src/libnsss/nsss_switch_shadow_rewind.c b/src/libnsss/nsss_switch_shadow_rewind.c index 449f25c..9ebf76c 100644 --- a/src/libnsss/nsss_switch_shadow_rewind.c +++ b/src/libnsss/nsss_switch_shadow_rewind.c @@ -3,7 +3,7 @@ #include <nsss/nsss-switch.h> #include "nsss-switch-internal.h" -int nsss_switch_shadow_rewind (nsss_switch_t *a, tain_t const *deadline, tain_t *stamp) +int nsss_switch_shadow_rewind (nsss_switch_t *a, tain const *deadline, tain *stamp) { return nsss_switch_op(a, NSSS_SWITCH_SHADOW_REWIND, deadline, stamp) ; } diff --git a/src/libnsss/nsss_switch_start.c b/src/libnsss/nsss_switch_start.c index 31e8b42..220a7e2 100644 --- a/src/libnsss/nsss_switch_start.c +++ b/src/libnsss/nsss_switch_start.c @@ -6,7 +6,7 @@ #include <nsss/nsss-switch.h> -static inline int nsss_switch_connect (nsss_switch_t *a, char const *path, tain_t const *deadline, tain_t *stamp) +static inline int nsss_switch_connect (nsss_switch_t *a, char const *path, tain const *deadline, tain *stamp) { int fd = ipc_stream_nbcoe() ; if (fd < 0) return 0 ; @@ -19,7 +19,7 @@ static inline int nsss_switch_connect (nsss_switch_t *a, char const *path, tain_ return 1 ; } -int nsss_switch_start (nsss_switch_t *a, unsigned int what, char const *path, tain_t const *deadline, tain_t *stamp) +int nsss_switch_start (nsss_switch_t *a, unsigned int what, char const *path, tain const *deadline, tain *stamp) { if (!a->held && !nsss_switch_connect(a, path, deadline, stamp)) return 0 ; a->held |= (1U << what) ; |