diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-16 22:39:51 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-16 22:39:51 +0000 |
| commit | 13c5a6832f9ad7fc5448de1c2f977e575c4b2dcb (patch) | |
| tree | 7fc88766e8b5a39f88d7d54f41a62c219b791c94 /applets/applets.c | |
| parent | f46be091060ad48b124a99d4a996405e85c63a33 (diff) | |
| download | busybox-w32-13c5a6832f9ad7fc5448de1c2f977e575c4b2dcb.tar.gz busybox-w32-13c5a6832f9ad7fc5448de1c2f977e575c4b2dcb.tar.bz2 busybox-w32-13c5a6832f9ad7fc5448de1c2f977e575c4b2dcb.zip | |
mount: support user mounts if CONFIG_DESKTOP
Diffstat (limited to 'applets/applets.c')
| -rw-r--r-- | applets/applets.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/applets/applets.c b/applets/applets.c index 5d8b80881..00102daa3 100644 --- a/applets/applets.c +++ b/applets/applets.c | |||
| @@ -316,10 +316,10 @@ static void parse_config_file(void) | |||
| 316 | #endif /* CONFIG_FEATURE_SUID_CONFIG */ | 316 | #endif /* CONFIG_FEATURE_SUID_CONFIG */ |
| 317 | 317 | ||
| 318 | #ifdef CONFIG_FEATURE_SUID | 318 | #ifdef CONFIG_FEATURE_SUID |
| 319 | static void check_suid (struct BB_applet *applet) | 319 | static void check_suid(struct BB_applet *applet) |
| 320 | { | 320 | { |
| 321 | uid_t ruid = getuid (); /* real [ug]id */ | 321 | uid_t ruid = getuid(); /* real [ug]id */ |
| 322 | uid_t rgid = getgid (); | 322 | uid_t rgid = getgid(); |
| 323 | 323 | ||
| 324 | #ifdef CONFIG_FEATURE_SUID_CONFIG | 324 | #ifdef CONFIG_FEATURE_SUID_CONFIG |
| 325 | if (suid_cfg_readable) { | 325 | if (suid_cfg_readable) { |
| @@ -334,7 +334,7 @@ static void check_suid (struct BB_applet *applet) | |||
| 334 | 334 | ||
| 335 | if (sct->m_uid == ruid) /* same uid */ | 335 | if (sct->m_uid == ruid) /* same uid */ |
| 336 | m >>= 6; | 336 | m >>= 6; |
| 337 | else if ((sct->m_gid == rgid) || ingroup (ruid, sct->m_gid)) /* same group / in group */ | 337 | else if ((sct->m_gid == rgid) || ingroup(ruid, sct->m_gid)) /* same group / in group */ |
| 338 | m >>= 3; | 338 | m >>= 3; |
| 339 | 339 | ||
| 340 | if (!(m & S_IXOTH)) /* is x bit not set ? */ | 340 | if (!(m & S_IXOTH)) /* is x bit not set ? */ |
| @@ -358,7 +358,7 @@ static void check_suid (struct BB_applet *applet) | |||
| 358 | 358 | ||
| 359 | if (!onetime) { | 359 | if (!onetime) { |
| 360 | onetime = 1; | 360 | onetime = 1; |
| 361 | fprintf (stderr, "Using fallback suid method\n"); | 361 | fprintf(stderr, "Using fallback suid method\n"); |
| 362 | } | 362 | } |
| 363 | #endif | 363 | #endif |
| 364 | } | 364 | } |