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.
This commit is contained in:
2
login.c
2
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;
|
||||
}
|
||||
|
||||
@@ -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 {
|
||||
|
||||
2
net.h
2
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);
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user