razuki | Bonjour,
J'ai appliqué un patch à un fichier. 3 Hunk sur 11 est réussi et 8 sur 11 échoue.
--Est ce qu'on peut conclure quelque chose ? ( pour moi le patch a échoué et donc je ne peux pas avancer tant que le problème n'est pas résolu )
En fait c'est un patch pour snort pour que snort fonctionne avec OSSIM.
Voici le code :
Code :
- aro-debian:/opt/ossim/snort-2.7.0# patch -p0 < /opt/ossim/contrib/snort/snort-2.1-ossim.patch
- patching file src/output-plugins/spo_database.c
- Hunk #1 succeeded at 55 (offset 1 line).
- Hunk #2 succeeded at 70 with fuzz 1 (offset 1 line).
- Hunk #3 FAILED at 184.
- Hunk #4 succeeded at 226 with fuzz 2 (offset 4 lines).
- Hunk #5 FAILED at 330.
- Hunk #6 succeeded at 791 with fuzz 2 (offset 116 lines).
- Hunk #7 succeeded at 975 (offset 116 lines).
- Hunk #8 succeeded at 1035 (offset 116 lines).
- Hunk #9 succeeded at 2107 (offset 373 lines).
- Hunk #10 succeeded at 3323 (offset 488 lines).
- Hunk #11 FAILED at 3342.
- 3 out of 11 hunks FAILED -- saving rejects to file src/output-plugins/spo_database.c.rej
|
Voici le fichier spo_database.c.rej:
Code :
- ***************
- *** 176,181 ****
- PLOGINREC ms_login;
- DBINT ms_col;
- #endif
- } DatabaseData;
-
- /* list for lookup of shared data information */
- --- 184,191 ----
- PLOGINREC ms_login;
- DBINT ms_col;
- #endif
- + char *logfile;
- + FILE *file;
- } DatabaseData;
-
- /* list for lookup of shared data information */
- ***************
- *** 320,330 ****
- SharedDatabaseDataNode *current = NULL;
- char * escapedSensorName = NULL;
- char * escapedInterfaceName = NULL;
- !
-
- /* parse the argument list from the rules file */
- data = ParseDatabaseArgs(args);
-
- /* find a unique name for sensor if one was not supplied as an option */
- if(!data->sensor_name)
- {
- --- 330,348 ----
- SharedDatabaseDataNode *current = NULL;
- char * escapedSensorName = NULL;
- char * escapedInterfaceName = NULL;
- ! char * filename=NULL;
-
- /* parse the argument list from the rules file */
- data = ParseDatabaseArgs(args);
-
- + /* File Log */
- + if (data->logfile != NULL)
- + {
- + filename = ProcessFileOption(data->logfile);
- + data->file = OpenAlertFile(filename);
- + free(filename);
- + }
- +
- /* find a unique name for sensor if one was not supplied as an option */
- if(!data->sensor_name)
- {
- ***************
- *** 3245,3250 ****
-
- UpdateLastCid(data, data->shared->sid, data->shared->cid-1);
- Disconnect(data);
- if(data != NULL)
- {
- free(data);
- --- 3342,3354 ----
-
- UpdateLastCid(data, data->shared->sid, data->shared->cid-1);
- Disconnect(data);
- +
- + if (data->logfile != NULL)
- + free (data->logfile);
- +
- + if (data->file != NULL)
- + fclose (data->file);
- +
- if(data != NULL)
- {
- free(data);
|
Merci d'avance |
