Avoid segfault by ftpfs_init_passwd
Этот коммит содержится в:
родитель
4a1dcb109b
Коммит
06744a04b7
@ -1,3 +1,7 @@
|
|||||||
|
2000-02-03 Andrew V. Samoilov <sav@bcs.zp.ua>
|
||||||
|
|
||||||
|
* setup.c (load_setup): call ftpfs_init_passwd to avoid segfault
|
||||||
|
|
||||||
2000-01-24 Andrew V. Samoilov <sav@bcs.zp.ua>
|
2000-01-24 Andrew V. Samoilov <sav@bcs.zp.ua>
|
||||||
|
|
||||||
* main.c (parse_control_file): add extra secutity checks for
|
* main.c (parse_control_file): add extra secutity checks for
|
||||||
|
15
src/setup.c
15
src/setup.c
@ -98,7 +98,7 @@ int startup_right_mode;
|
|||||||
/* default panel values */
|
/* default panel values */
|
||||||
int saving_setup;
|
int saving_setup;
|
||||||
|
|
||||||
static struct {
|
static const struct {
|
||||||
char *key;
|
char *key;
|
||||||
sortfn *sort_type;
|
sortfn *sort_type;
|
||||||
} sort_names [] = {
|
} sort_names [] = {
|
||||||
@ -113,7 +113,7 @@ static struct {
|
|||||||
{ 0, 0 }
|
{ 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct {
|
static const struct {
|
||||||
char *key;
|
char *key;
|
||||||
int list_type;
|
int list_type;
|
||||||
} list_types [] = {
|
} list_types [] = {
|
||||||
@ -125,7 +125,7 @@ static struct {
|
|||||||
{ 0, 0 }
|
{ 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct {
|
static const struct {
|
||||||
char *opt_name;
|
char *opt_name;
|
||||||
int opt_type;
|
int opt_type;
|
||||||
} panel_types [] = {
|
} panel_types [] = {
|
||||||
@ -136,7 +136,7 @@ static struct {
|
|||||||
{ 0, 0 }
|
{ 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct {
|
static const struct {
|
||||||
char *opt_name;
|
char *opt_name;
|
||||||
int *opt_addr;
|
int *opt_addr;
|
||||||
} layout [] = {
|
} layout [] = {
|
||||||
@ -163,7 +163,7 @@ static struct {
|
|||||||
extern int preserve_uidgid;
|
extern int preserve_uidgid;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static struct {
|
static const struct {
|
||||||
char *opt_name;
|
char *opt_name;
|
||||||
int *opt_addr;
|
int *opt_addr;
|
||||||
} options [] = {
|
} options [] = {
|
||||||
@ -631,6 +631,11 @@ load_setup (void)
|
|||||||
/* Remove the temporal entries */
|
/* Remove the temporal entries */
|
||||||
profile_clean_section ("Temporal:New Left Panel", profile_name);
|
profile_clean_section ("Temporal:New Left Panel", profile_name);
|
||||||
profile_clean_section ("Temporal:New Right Panel", profile_name);
|
profile_clean_section ("Temporal:New Right Panel", profile_name);
|
||||||
|
#ifdef USE_VFS
|
||||||
|
#ifdef USE_NETCODE
|
||||||
|
ftpfs_init_passwd ();
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef USE_VFS
|
#ifdef USE_VFS
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user