mars_nwe/mars-nwe
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases 2 Wiki Activity

Clean up nwdbm, nwroute and trustee warnings

Browse Source
This commit is contained in:
Mario Fetka
2026-04-20 23:39:42 +02:00
parent 8e8b837c63
commit fd9daeb22f
3 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/trustee.c
View File

@@ -398,10 +398,10 @@ static int del_trustee_from_disk(int volume, dev_t dev, ino_t inode, uint32 id)
(int) buf_uc[2],
(int) buf_uc[3],
(unsigned int)id);
seteuid(0);
(void)seteuid(0);
if (!unlink(buf))
result=0;
reseteuid();
(void)reseteuid();
return(result);
}
@@ -423,12 +423,12 @@ unsigned int tru_vol_sernum(int volume, int mode)
}
if (mode) {
if (++sernum==MAX_U32) sernum=1;
seteuid(0);
(void)seteuid(0);
unlink(buf);
slprintf(buf1, sizeof(buf1)-1, "%x", sernum);
if (symlink(buf1, buf))
errorp(0, "rw_trustee_sernum", "symlink %s %s failed", buf1, buf);
reseteuid();
(void)reseteuid();
tru_free_cache(volume);
}
return(sernum);
@@ -449,12 +449,12 @@ void tru_free_file_trustees_from_disk(int volume, int dev, ino_t inode)
(int) buf_uc[1],
(int) buf_uc[2]);
slprintf(buf+len, sizeof(buf) - len -1, "t.%x", (int)buf_uc[3]);
seteuid(0);
(void)seteuid(0);
unx_xrmdir(buf);
/* now we remove the name of the dir/file */
slprintf(buf+len, sizeof(buf) -len -1, "n.%x", (int)buf_uc[3]);
unlink(buf);
reseteuid();
(void)reseteuid();
}
int tru_del_trustee(int volume, uint8 *unixname, struct stat *stb, uint32 id)
@@ -601,7 +601,7 @@ static int local_tru_add_trustee_set(int volume, uint8 *unixname,
int volumenamelen = get_volume_unixnamlen(volume);
uint8 ufnbuf[2];
uint8 *ufn;
seteuid(0);
(void)seteuid(0);
while (count--) {
if (! ((own_eff_rights & TRUSTEE_S) || (act_id_flags&1)) ) {
/* only user with TRUSTEE_S are allowed to set TRUSTEE_S */
@@ -614,7 +614,7 @@ static int local_tru_add_trustee_set(int volume, uint8 *unixname,
nwoic->id, nwoic->trustee, volume, unixname, -result);
})
if (result){
reseteuid();
(void)reseteuid();
goto func_err;
}
nwoic++;
@@ -626,7 +626,7 @@ static int local_tru_add_trustee_set(int volume, uint8 *unixname,
*(ufn+1)='\0';
}
creat_trustee_path(volume, stb->st_dev, stb->st_ino, ufn);
reseteuid();
(void)reseteuid();
#if 0 /* now in tru_add_trustee_set */
tru_vol_sernum(volume, 1); /* trustee sernum needs updated */
#endif
@@ -652,7 +652,7 @@ int tru_add_trustee_set(int volume, uint8 *unixname,
char *p = unixname+len;
char *volp = unixname+vollen;
seteuid(0);
(void)seteuid(0);
while (--p > volp) {
if (*p == '/') {
struct stat statb;
@@ -675,7 +675,7 @@ int tru_add_trustee_set(int volume, uint8 *unixname,
*p='/';
}
}
reseteuid();
(void)reseteuid();
tru_vol_sernum(volume, 1); /* trustee sernum needs updated */
}
return (result);
@@ -715,9 +715,9 @@ int tru_set_inherited_mask(int volume, uint8 *unixname,
FILE_TRUSTEE_NODE *tr=find_trustee_node(volume, stb->st_dev, stb->st_ino);
if (tr && (!(tr->mode_flags&0x1e) || !act_uid)) {
int result;
seteuid(0);
(void)seteuid(0);
result=put_trustee_to_disk(volume, stb->st_dev, stb->st_ino, 0L, new_mask);
reseteuid();
(void)reseteuid();
if (!result)
tru_vol_sernum(volume, 1); /* trustee sernum needs updated */
return(result);