From adf16cab28452632433ebf8e0ee84b07da83a2fc Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 29 May 2026 10:01:48 +0200 Subject: [PATCH] ncpcalls: keep bindery access level wrapper on NCP14 name Rename the bindery access level wrapper from ncp17_46_get_bindery_access_level() to ncp14_46_get_bindery_access_level(). The previous rename made the operation look like a normal NCP17 bindery wrapper, but the historic implementation used the ncp_14_46 naming. Keep that protocol reference visible while retaining the descriptive operation name. No behavior change. --- login.c | 2 +- ncpcall.c | 2 +- net.h | 2 +- nwtests.c | 2 +- whoami.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/login.c b/login.c index 8f87402..28e5d51 100644 --- a/login.c +++ b/login.c @@ -926,7 +926,7 @@ int func_passwd(int argc, char *argv[], int mode) uint8 upasswd[130]; uint32 my_obj_id; - if (ncp17_46_get_bindery_access_level(&my_obj_id) < 0 || my_obj_id == MAX_U32 || !my_obj_id) { + if (ncp14_46_get_bindery_access_level(&my_obj_id) < 0 || my_obj_id == MAX_U32 || !my_obj_id) { fprintf(stderr, "Cannot get actual user id\n"); result = -1; } diff --git a/ncpcall.c b/ncpcall.c index ae21a81..ac2e850 100644 --- a/ncpcall.c +++ b/ncpcall.c @@ -249,7 +249,7 @@ int ncp17_40_change_password_unencrypted(uint8 *objname, uint16 objtyp, return(0); } -int ncp17_46_get_bindery_access_level(uint32 *obj_id) +int ncp14_46_get_bindery_access_level(uint32 *obj_id) /* get bindery access level & actual ID */ { struct { diff --git a/net.h b/net.h index b02d6e6..1db7d24 100644 --- a/net.h +++ b/net.h @@ -262,7 +262,7 @@ extern int ncp16_02_get_directory_entry(int dirhandle, uint32 *creattime, uint32 *owner_id); -extern int ncp17_46_get_bindery_access_level(uint32 *obj_id); +extern int ncp14_46_get_bindery_access_level(uint32 *obj_id); extern int ncp17_02_set_debug_level(int module, int debuglevel); extern int ncp17_14_login_object_unencrypted(uint8 *objname, uint16 objtyp, uint8 *password); extern int ncp17_17_get_encryption_key(uint8 *key); diff --git a/nwtests.c b/nwtests.c index b54fbb9..c43fc2e 100644 --- a/nwtests.c +++ b/nwtests.c @@ -2506,7 +2506,7 @@ static int tests_effright(char *path) { int access_level; - access_level = ncp17_46_get_bindery_access_level(&my_obj_id); + access_level = ncp14_46_get_bindery_access_level(&my_obj_id); my_obj_name[0] = '\0'; if (access_level >= 0 && my_obj_id) { ncp17_36_get_bindery_object_name(my_obj_id, my_obj_name, &my_obj_type); diff --git a/whoami.c b/whoami.c index 1d2e61e..667a99b 100644 --- a/whoami.c +++ b/whoami.c @@ -375,7 +375,7 @@ int func_whoami(int argc, char *argv[], int mode) } obj_name[0] = '\0'; - ncp17_46_get_bindery_access_level(&obj_id); + ncp14_46_get_bindery_access_level(&obj_id); if (obj_id) ncp17_36_get_bindery_object_name(obj_id, obj_name, &obj_type);