Fossil SCM
Remove ambiguity in LOGIN_IGNORE_U and LOGIN_IGNORE_V flags by combining them into a single flag.
Commit
49546c5a87aaaecf5f726870f115369f3b9c0e90
Parent
6d4f9a3b6992ddb…
1 file changed
+5
-6
+5
-6
| --- src/login.c | ||
| +++ src/login.c | ||
| @@ -938,12 +938,11 @@ | ||
| 938 | 938 | |
| 939 | 939 | /* |
| 940 | 940 | ** Flags passed into the 2nd argument of login_set/replace_capabilities(). |
| 941 | 941 | */ |
| 942 | 942 | #if INTERFACE |
| 943 | -#define LOGIN_IGNORE_U 0x01 /* Ignore "u" */ | |
| 944 | -#define LOGIN_IGNORE_V 0x01 /* Ignore "v" */ | |
| 943 | +#define LOGIN_IGNORE_UV 0x01 /* Ignore "u" and "v" */ | |
| 945 | 944 | #endif |
| 946 | 945 | |
| 947 | 946 | /* |
| 948 | 947 | ** Adds all capability flags in zCap to g.perm. |
| 949 | 948 | */ |
| @@ -986,25 +985,25 @@ | ||
| 986 | 985 | case 'x': g.perm.Private = 1; break; |
| 987 | 986 | |
| 988 | 987 | /* The "u" privileges is a little different. It recursively |
| 989 | 988 | ** inherits all privileges of the user named "reader" */ |
| 990 | 989 | case 'u': { |
| 991 | - if( (flags & LOGIN_IGNORE_U)==0 ){ | |
| 990 | + if( (flags & LOGIN_IGNORE_UV)==0 ){ | |
| 992 | 991 | const char *zUser; |
| 993 | 992 | zUser = db_text("", "SELECT cap FROM user WHERE login='reader'"); |
| 994 | - login_set_capabilities(zUser, flags | LOGIN_IGNORE_U); | |
| 993 | + login_set_capabilities(zUser, flags | LOGIN_IGNORE_UV); | |
| 995 | 994 | } |
| 996 | 995 | break; |
| 997 | 996 | } |
| 998 | 997 | |
| 999 | 998 | /* The "v" privileges is a little different. It recursively |
| 1000 | 999 | ** inherits all privileges of the user named "developer" */ |
| 1001 | 1000 | case 'v': { |
| 1002 | - if( (flags & LOGIN_IGNORE_V)==0 ){ | |
| 1001 | + if( (flags & LOGIN_IGNORE_UV)==0 ){ | |
| 1003 | 1002 | const char *zDev; |
| 1004 | 1003 | zDev = db_text("", "SELECT cap FROM user WHERE login='developer'"); |
| 1005 | - login_set_capabilities(zDev, flags | LOGIN_IGNORE_V); | |
| 1004 | + login_set_capabilities(zDev, flags | LOGIN_IGNORE_UV); | |
| 1006 | 1005 | } |
| 1007 | 1006 | break; |
| 1008 | 1007 | } |
| 1009 | 1008 | } |
| 1010 | 1009 | } |
| 1011 | 1010 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -938,12 +938,11 @@ | |
| 938 | |
| 939 | /* |
| 940 | ** Flags passed into the 2nd argument of login_set/replace_capabilities(). |
| 941 | */ |
| 942 | #if INTERFACE |
| 943 | #define LOGIN_IGNORE_U 0x01 /* Ignore "u" */ |
| 944 | #define LOGIN_IGNORE_V 0x01 /* Ignore "v" */ |
| 945 | #endif |
| 946 | |
| 947 | /* |
| 948 | ** Adds all capability flags in zCap to g.perm. |
| 949 | */ |
| @@ -986,25 +985,25 @@ | |
| 986 | case 'x': g.perm.Private = 1; break; |
| 987 | |
| 988 | /* The "u" privileges is a little different. It recursively |
| 989 | ** inherits all privileges of the user named "reader" */ |
| 990 | case 'u': { |
| 991 | if( (flags & LOGIN_IGNORE_U)==0 ){ |
| 992 | const char *zUser; |
| 993 | zUser = db_text("", "SELECT cap FROM user WHERE login='reader'"); |
| 994 | login_set_capabilities(zUser, flags | LOGIN_IGNORE_U); |
| 995 | } |
| 996 | break; |
| 997 | } |
| 998 | |
| 999 | /* The "v" privileges is a little different. It recursively |
| 1000 | ** inherits all privileges of the user named "developer" */ |
| 1001 | case 'v': { |
| 1002 | if( (flags & LOGIN_IGNORE_V)==0 ){ |
| 1003 | const char *zDev; |
| 1004 | zDev = db_text("", "SELECT cap FROM user WHERE login='developer'"); |
| 1005 | login_set_capabilities(zDev, flags | LOGIN_IGNORE_V); |
| 1006 | } |
| 1007 | break; |
| 1008 | } |
| 1009 | } |
| 1010 | } |
| 1011 |
| --- src/login.c | |
| +++ src/login.c | |
| @@ -938,12 +938,11 @@ | |
| 938 | |
| 939 | /* |
| 940 | ** Flags passed into the 2nd argument of login_set/replace_capabilities(). |
| 941 | */ |
| 942 | #if INTERFACE |
| 943 | #define LOGIN_IGNORE_UV 0x01 /* Ignore "u" and "v" */ |
| 944 | #endif |
| 945 | |
| 946 | /* |
| 947 | ** Adds all capability flags in zCap to g.perm. |
| 948 | */ |
| @@ -986,25 +985,25 @@ | |
| 985 | case 'x': g.perm.Private = 1; break; |
| 986 | |
| 987 | /* The "u" privileges is a little different. It recursively |
| 988 | ** inherits all privileges of the user named "reader" */ |
| 989 | case 'u': { |
| 990 | if( (flags & LOGIN_IGNORE_UV)==0 ){ |
| 991 | const char *zUser; |
| 992 | zUser = db_text("", "SELECT cap FROM user WHERE login='reader'"); |
| 993 | login_set_capabilities(zUser, flags | LOGIN_IGNORE_UV); |
| 994 | } |
| 995 | break; |
| 996 | } |
| 997 | |
| 998 | /* The "v" privileges is a little different. It recursively |
| 999 | ** inherits all privileges of the user named "developer" */ |
| 1000 | case 'v': { |
| 1001 | if( (flags & LOGIN_IGNORE_UV)==0 ){ |
| 1002 | const char *zDev; |
| 1003 | zDev = db_text("", "SELECT cap FROM user WHERE login='developer'"); |
| 1004 | login_set_capabilities(zDev, flags | LOGIN_IGNORE_UV); |
| 1005 | } |
| 1006 | break; |
| 1007 | } |
| 1008 | } |
| 1009 | } |
| 1010 |