mars_nwe/mars-dosutils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ncpcalls: keep bindery access level wrapper on NCP14 name

Browse Source 
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.
This commit is contained in:
Mario Fetka
2026-05-29 10:01:48 +02:00
parent 53e28c6bfe
commit adf16cab28
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
login.c
View File

@@ -926,7 +926,7 @@ int func_passwd(int argc, char *argv[], int mode)
uint8 upasswd[130]; uint8 upasswd[130];
uint32 my_obj_id; 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"); fprintf(stderr, "Cannot get actual user id\n");
result = -1; result = -1;
} }

2
ncpcall.c
View File

@@ -249,7 +249,7 @@ int ncp17_40_change_password_unencrypted(uint8 *objname, uint16 objtyp,
return(0); 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 */ /* get bindery access level & actual ID */
{ {
struct { struct {

2
net.h
View File

@@ -262,7 +262,7 @@ extern int ncp16_02_get_directory_entry(int dirhandle,
uint32 *creattime, uint32 *creattime,
uint32 *owner_id); 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_02_set_debug_level(int module, int debuglevel);
extern int ncp17_14_login_object_unencrypted(uint8 *objname, uint16 objtyp, uint8 *password); extern int ncp17_14_login_object_unencrypted(uint8 *objname, uint16 objtyp, uint8 *password);
extern int ncp17_17_get_encryption_key(uint8 *key); extern int ncp17_17_get_encryption_key(uint8 *key);

2
nwtests.c
View File

@@ -2506,7 +2506,7 @@ static int tests_effright(char *path)
{ {
int access_level; 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'; my_obj_name[0] = '\0';
if (access_level >= 0 && my_obj_id) { if (access_level >= 0 && my_obj_id) {
ncp17_36_get_bindery_object_name(my_obj_id, my_obj_name, &my_obj_type); ncp17_36_get_bindery_object_name(my_obj_id, my_obj_name, &my_obj_type);

2
whoami.c
View File

@@ -375,7 +375,7 @@ int func_whoami(int argc, char *argv[], int mode)
} }
obj_name[0] = '\0'; obj_name[0] = '\0';
ncp17_46_get_bindery_access_level(&obj_id); ncp14_46_get_bindery_access_level(&obj_id);
if (obj_id) if (obj_id)
ncp17_36_get_bindery_object_name(obj_id, obj_name, &obj_type); ncp17_36_get_bindery_object_name(obj_id, obj_name, &obj_type);